From: "Peter Harris" <git@peter.is-a-geek.org>
To: "Peter Valdemar Mørch (Lists)" <4ux6as402@sneakemail.com>
Cc: git@vger.kernel.org
Subject: Re: Git (svn) merge - but ignore certain commits?
Date: Thu, 8 Jan 2009 13:29:54 -0500 [thread overview]
Message-ID: <eaa105840901081029h220e06e4m1a1af693e908751e@mail.gmail.com> (raw)
In-Reply-To: <49663CA2.90102@sneakemail.com>
On Thu, Jan 8, 2009 at 12:49 PM, "Peter Valdemar Mørch (Lists)" wrote:
>
> 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
next prev parent reply other threads:[~2009-01-08 18:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-27 13:02 Git (svn) merge - but ignore certain commits? "Peter Valdemar Mørch (Lists)"
2008-12-28 0:17 ` Peter Harris
2009-01-08 17:49 ` "Peter Valdemar Mørch (Lists)"
2009-01-08 18:29 ` Peter Harris [this message]
2009-01-08 19:17 ` "Peter Valdemar Mørch (Lists)"
2009-01-08 20:00 ` Peter Harris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eaa105840901081029h220e06e4m1a1af693e908751e@mail.gmail.com \
--to=git@peter.is-a-geek.org \
--cc=4ux6as402@sneakemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).