From: Alexander Litvinov <litvinov2004@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: Re: Question: next, master and pu branches
Date: Fri, 2 Feb 2007 12:54:44 +0600 [thread overview]
Message-ID: <200702021254.44992.litvinov2004@gmail.com> (raw)
In-Reply-To: <20070202060030.GA20442@spearce.org>
> 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 ?
next prev parent reply other threads:[~2007-02-02 6:54 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 [this message]
2007-02-02 6:57 ` Shawn O. Pearce
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=200702021254.44992.litvinov2004@gmail.com \
--to=litvinov2004@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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).