Thank you. I have accomplished my goal successfully. Following is what
I did:
Again, I have all my work I did. It is located in the directory
mine/ and I use git to version control all my work. I received the
work files from my partner. He does not use any version control. He
sent me his tar
Just adding one more point: if during git cherry-pick, there are
conflicts and I found that merge is too messy and complicated. I want
to give up and back to the state before doing git cherry-pick, I
used this command:
git reset --hard HEAD
On Tue, 18 Oct 2011 05:45:01 -0700 (PDT)
www xs...@yahoo.com wrote:
[...]
However, most--i intend to say all-- git tutotials are half-baked,
including some well-cited tutorials. It seems nobody has the patience
to write it down and show other people and just let other people--like
me-- to
Alright, I agree with you. Thank you for the tip svn patch.
May I ask you one more question just for my learning purpose? If I ask
my partner who works in a different company also use git, when he
sends me the files he modified and together with .git/ directory. I
can put all his files AND .git
On Tue, 18 Oct 2011 07:17:39 -0700 (PDT)
www xs...@yahoo.com wrote:
May I ask you one more question just for my learning purpose? If I ask
my partner who works in a different company also use git, when he
sends me the files he modified and together with .git/ directory. I
can put all his
