All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Bash <bash@genarts.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: "Temporary merge branch 2" Conflicts
Date: Fri, 17 Aug 2012 09:48:45 -0400 (EDT)	[thread overview]
Message-ID: <1972858401.161319.1345211324976.JavaMail.root@genarts.com> (raw)
In-Reply-To: <73388252.160741.1345208957127.JavaMail.root@genarts.com>

Hi all-

Given this branch history:

 ---------M------M---M-------> dev
     \   /      /   /
      --------------           v1-maint
            \   \   \
             ----M---M-------> v1.5-maint

I am attempting to merge v1.5-maint into dev.  There are some expected conflicts, but when I start mergetool (kdiff3) there are also a lot of conflict markers in the base that look like this

<<<<<<< Temporary merge branch 1
    ... code here ...
=======
    ... more code here ...
>>>>>>> Temporary merge branch 2

which confuse kdiff3.  Googling around I found a few mentions of these temporary merge branches, e.g. $gmane/157591, but I don't think we have any criss-cross merges.  Can anyone provide some advice?

Any suggestions are greatly appreciated!

Thanks,
Stephen

       reply	other threads:[~2012-08-17 13:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <73388252.160741.1345208957127.JavaMail.root@genarts.com>
2012-08-17 13:48 ` Stephen Bash [this message]
2012-08-17 20:56   ` "Temporary merge branch 2" Conflicts Stephen Bash
2012-08-17 21:10     ` Junio C Hamano
2012-08-20 13:21       ` Stephen Bash

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=1972858401.161319.1345211324976.JavaMail.root@genarts.com \
    --to=bash@genarts.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.