From: Josef Wolf <jw@raven.inka.de>
Date: Thu, 02 Apr 2009 10:36:59 GMT
Subject: Re: How to sync two svn repositories via git?
Message-ID: <20090402103659.GB28619@raven.wolf.lan>
In-Reply-To: <49D46C2B.3080100@drmicha.warpmail.net>

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.