From: "Shawn O. Pearce" <spearce@spearce.org>
To: Alexander Litvinov <litvinov2004@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Question: next, master and pu branches
Date: Fri, 2 Feb 2007 01:57:35 -0500 [thread overview]
Message-ID: <20070202065735.GA20832@spearce.org> (raw)
In-Reply-To: <200702021254.44992.litvinov2004@gmail.com>
Alexander Litvinov <litvinov2004@gmail.com> wrote:
> > You can let git-rerere help you to manage conflicts which might
> > reoccur during merges. If you create the .git/rr-cache directory
> > then git-commit and git-merge will automatically use git-rerere to
> > help you.
>
> Yes git-rerere is a black magic tool, but it works :-)
> Byt he way, why git-pull (or possible git-merge) does not commit the merge
> result after conflict was fixed by git-rerere ?
No, it doesn't. That way you can review the result of the merge
first and verify its indeed correct.
--
Shawn.
next prev parent reply other threads:[~2007-02-02 6:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-02 5:42 Question: next, master and pu branches Alexander Litvinov
2007-02-02 6:00 ` Shawn O. Pearce
2007-02-02 6:54 ` Alexander Litvinov
2007-02-02 6:57 ` Shawn O. Pearce [this message]
2007-02-02 6:02 ` Junio C Hamano
2007-02-02 6:52 ` Alexander Litvinov
-- strict thread matches above, loose matches on Subject: below --
2007-02-02 5:41 Alexander Litvinov
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=20070202065735.GA20832@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=litvinov2004@gmail.com \
/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.