Basile Starynkevitch <bas...@starynkevitch.net> writes:
> I dont understand why there is a conflict on an ada related file I
> never touched in my life.
The problem is that git does not know anything about the svn merges
(because svn does not know anything about merges itself). Thus the
merge base between melt-branch and master is the point where melt-branch
was created.
$ git rev-list $(git merge-base melt-branch master)..melt-branch | wc -l
1246
$ git show melt-branch~1245
commit bf7f3deb8c4263d0f7d26f17f807d7ee7275b5f9
Author: bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue Feb 19 15:01:57 2008 +0000
creating MELT branch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@132434
138bc75d-0d04-0410-961f-82ee72b054a4
> What is the good way to merge the trunk back into my MELT branch using
> git? How can I ask git to ignore such "conflicts" (as svnmerge merge
> did)?
The easiest way to get things going is to create a dummy merge in the
melt-branch that records the last svn merge you made. To do that you
need to find the last merged revision on the master branch and merge it
using the ours strategy. Then you can merge the master branch as usual.
$ git merge -s ours bd785057b42734e859f64428467a673ee3c00372
$ git merge master
Andreas.
--
Andreas Schwab, sch...@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
