On Mon, Feb 7, 2011 at 08:50, Basile Starynkevitch <bas...@starynkevitch.net> wrote:
> I'm trying hard to understand how to reliably and painlessly merge trunk > into the MELT branch. I am using the git mirror > git://gcc.gnu.org/git/gcc.git but I don't understand well if I should use > only it, or also git svn dcommit (which I do use). You will use git svn dcommit to submit the final merge, once you fixed it in your local tree. > I also cannot figure out how to reliably get the Svn id of the trunk gotten > by Git. With svnmerge, I had the information at the beginning of > svnmerge-*.txt 'git log master' will show you the git-svn-id entries for every SVN commit in the log. The top one is the latest that you will merge against. Diego.
