[git-users] How to merge two independent projects one commit by one commit?

2011-10-14 Thread www
Dear All: I am new to git and I am using linux. I am working on my project, using git and I have made about 20 commits. All my files are at the directory mine/ Inside mine, there is .git directory. Now, I received the tar files from my partner. He just finished his part of work and we are working

[git-users] Re: How to merge two independent projects one commit by one commit?

2011-10-18 Thread www
ou should make a copy of both repos > before you start, just in case), but I think something like this might > work: > > 1. Add your repository as a remote to the new repository. > 2. Pull your changes in to the new repository. > 3. From the new repository, git cherry-pick each commit

[git-users] Re: How to merge two independent projects one commit by one commit?

2011-10-18 Thread www
doing_in_git_-_reset,_checkout_and_revert.html On Oct 18, 12:45 pm, www wrote: > 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

[git-users] Re: How to merge two independent projects one commit by one commit?

2011-10-18 Thread www
s AND .git under partner/ directory. Then I can have his commits one by one. Is that correct? Thank you. On Oct 18, 1:45 pm, Konstantin Khomoutov wrote: > On Tue, 18 Oct 2011 05:45:01 -0700 (PDT) > > www wrote: > > [...]> However, most--i intend to say all-- git tutotials a

[git-users] how to get the code changes of another person to my local code?

2013-02-20 Thread www
Hi: I have used git for a while, but only for keeping tracking of the changes of my own in my own computer. I have never used git to cooperate with others. My naive question is: if somebody on the other city and me started with the same set files(or code), after a while, he has modified his fil

[git-users] Re: how to get the code changes of another person to my local code?

2013-02-21 Thread www
great value to us. Thank you so much. On Wednesday, February 20, 2013 4:32:41 PM UTC-5, www wrote: > > Hi: > > I have used git for a while, but only for keeping tracking of the changes > of my own in my own computer. I have never used git to cooperate with > others. My nai