On Thu, Apr 02, 2009 at 09:41:31AM +0200, Michael J Gruber wrote: > Josef Wolf venit, vidit, dixit 02.04.2009 00:30: [ ... ] > > The first step I'd like to do is to "mirror" the manual merges that were > > done between the subversion repositories in the past: > > > > git checkout svn-first > > git merge -s ours --log commit-of-the-first-merge-in-svn-second > > > > git checkout svn-second > > git merge -s ours --log commit-of-the-first-merge-in-svn-first > > > > This seems to work, but git-gui shows conflicts. How can I get conflicts > > when I use the "-s ours" merge strategy? > > What do git status and git diff (--stat, --combined) say? Umm, that's somewhat odd. Directly after the merge commands, gitk says there are local modifications. Then I run "git status" which says the working directory is clean. Then I re-run gitk, which _now_ shows no local modifications any more. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
