git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-svn merging into branch?

From
JQJean-Baptiste Quenot <jbq@caraldi.com>
Date
Mar 28, 2008, 08:34 UTC
Message-ID
<ae63f8b50803280134v1d24854dwacd21a1ef95951ed@mail.gmail.com>
In-Reply-To
<B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675@faithfulgeek.org>

You can either use SVN-specific tools, namely svn merge or svnmerge, or GIT-specific tools, namely git merge, git rebase or git cherry pick. If you choose the latter, once done you can simply git-svn dcommit your changes.

Cheers,
-- 
Jean-Baptiste Quenot
http://caraldi.com/jbq/blog/
Previous: Joe Fiorini
Message 3 of 3 in “git-svn merging into branch?”
  1. Joe FioriniMar 27, 2008
  2. Joe FioriniMar 28, 2008
  3. Jean-Baptiste QuenotMar 28, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.