I might be wrong, so be careful (you 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. Wes On Fri, Oct 14, 2011 at 3:44 PM, www <xs...@yahoo.com> wrote: > 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 on the same set of > files. He does not use version control. I put all his files in the > parallel directory his/. I did the following: > > cd his > git init > git add xxxx //all the stuff > git commit . -m "received from partner and he has finished his part" > > Ideally, I want to step by step merge my revision one, my revision > two, my revision three, etc from mine/ into his/ > > It is very likely that there will be conflicts since we are touching > same files. So I want to do merging step by step. I hope to view each > revision modification before committing. > > How can I do it? I have googled and studied the whole day and my brain > hurts. > > Thank you very, very much. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
