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

Re: Git (svn) merge - but ignore certain commits?

From
PHPeter Harris <git@peter.is-a-geek.org>
Date
Jan 8, 2009, 18:29 UTC
Message-ID
<eaa105840901081029h220e06e4m1a1af693e908751e@mail.gmail.com>
In-Reply-To
<49663CA2.90102@sneakemail.com>
On Thu, Jan 8, 2009 at 12:49 PM, "Peter Valdemar Mørch (Lists)" wrote:
Show 5 quoted lines
>
> However *the* problem was with repeated merges: I later discovered a problem
> on the branch and need to add a commit for it to both master and
> newbranch/gitnewbranch. Aside from git cherry-pick (where I take care of the
> repeated merge problem) I still haven't found a good solution.

Well, the real problem is that it *isn't* a repeated merge. Subversion rebased your trunk on you, so you...

> I ended up using git cherry-pick, and diff and patch / git diff and git
> apply.
...wind up needing to do this.

Don't rebase trunk (which implies ditching subversion, (un)fortunately), and repeated merges should Just Work. See, for example, the git repository itself, where the master branch is repeatedly merged into next.

Peter Harris
Previous: Peter Valdemar Mørch (Lists)Next: Peter Valdemar Mørch (Lists)
Message 4 of 6 in “Git (svn) merge - but ignore certain commits?”
  1. Peter Valdemar Mørch (Lists)Dec 27, 2008
  2. Peter HarrisDec 28, 2008
  3. Peter Valdemar Mørch (Lists)Jan 8, 2009
  4. Peter HarrisJan 8, 2009
  5. Peter Valdemar Mørch (Lists)Jan 8, 2009
  6. Peter HarrisJan 8, 2009

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.