From: Jonathan Nieder <jrnieder@gmail.com>
To: Klas Lindberg <klas.lindberg@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Detect merge/rebase conflicts without changing the worktree?
Date: Wed, 27 Oct 2010 19:01:15 -0500 [thread overview]
Message-ID: <20101028000115.GC30490@burratino> (raw)
In-Reply-To: <AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>
Hi Klas,
Klas Lindberg wrote:
> What is the recommended way to detect merge/rebase conflicts without
> actually modifying the worktree?
You might like "git merge-tree".
next prev parent reply other threads:[~2010-10-28 0:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 23:40 Detect merge/rebase conflicts without changing the worktree? Klas Lindberg
2010-10-28 0:01 ` Jonathan Nieder [this message]
2010-10-28 10:01 ` Klas Lindberg
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=20101028000115.GC30490@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=klas.lindberg@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 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).