git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Pearce <spearce@spearce.org>
To: git@vger.kernel.org
Subject: Why doesn't git-rerere automatically commit a resolution?
Date: Tue, 11 Jul 2006 02:16:26 -0400	[thread overview]
Message-ID: <20060711061626.GB11822@spearce.org> (raw)

I'm curious... I have a pair of topic branches which don't merge
together cleanly by recursive (due to conflicting hunks in the
same line segments).  I enabled git-rerere, ran the merge, fixed
up the hunks and committed it.  git-rerere built its cache, as
the next time I pulled the two topic branches together and got
the same conflicts it correctly regenerated the prior resolution
(and printed a message saying as much).

But it git-rerere left the files unmerged in the index and it
doesn't generate a commit for the merge, even though there are no
merge conflicts remaining.  I expected it to update the index (to
merge the stages) and to generate a commit if possible; especially
in this case as I was pulling the exact same two commits together
again with the exact same merge base commit.

So I'm wondering why doesn't it try to finish the merge?  Was there
a really deep rooted reason behind it or was it simply easier/safer
to let the user sort out the working directory state every time?

-- 
Shawn.

             reply	other threads:[~2006-07-11  6:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-11  6:16 Shawn Pearce [this message]
2006-07-11  6:58 ` Why doesn't git-rerere automatically commit a resolution? Junio C Hamano
2006-07-11 13:29   ` Shawn Pearce
2006-07-11  7:05 ` Matthias Kestenholz

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=20060711061626.GB11822@spearce.org \
    --to=spearce@spearce.org \
    --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).