Comments on: git merge -s remote ?

By: Luca de Alfaro

Luca de Alfaro — Thu, 06 Nov 2008 08:13:53 +0000

Found a solution. See http://docs.google.com/Doc?id=dct27ngc_86gqtpprmk Best, Luca

By: Luca de Alfaro

Luca de Alfaro — Thu, 06 Nov 2008 07:42:26 +0000

Hi Andrey,

I have your exact problem. Did you find a solution? Many thanks,

Luca

By: Andrey Khavryuchenko

Andrey Khavryuchenko — Wed, 24 Sep 2008 13:53:33 +0000

Note to myself.

If you get

Unable to determine upstream SVN information from working tree history

then finding the commit hash of last svn commit (via git svn find-rev) and reseting to it (git reset --hard) helps.

By: Andrey Khavryuchenko

Andrey Khavryuchenko — Wed, 24 Sep 2008 13:26:38 +0000

Pat,

Ok, this doesn’t work.

git-svn immediately looses it’s track of remote svn branch:

$ git checkout svn
Switched to branch "svn"
$ git reset --hard master
HEAD is now at 1d306d1 - ticket:50 deployed
$ git svn rebase
Unable to determine upstream SVN information from working tree history

Oops

By: Andrey Khavryuchenko

Andrey Khavryuchenko — Wed, 24 Sep 2008 07:44:06 +0000

Thanks, Pat!

I've not thought about git reset solution despite daily using it (in buildbot).

Will try to see how it lives with svn-tracking branch...

By: Pat Notz

Pat Notz — Wed, 24 Sep 2008 03:34:35 +0000

Check out this Question on Stack Overflow:

http://stackoverflow.com/questions/101752/aborting-a-merge-in-git

And this post:

http://marc.info/?l=git&m=121637513604413&w=2