From: Junio C Hamano <gitster@pobox•com>
To: Aaron Schrab <aaron@schrab•com>
Cc: git@vger•kernel.org
Subject: Re: Merge without marking conflicts in working tree
Date: Mon, 17 Nov 2014 15:19:26 -0800 [thread overview]
Message-ID: <xmqqzjbpwh35.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20141117223836.GH615@pug.qqx.org> (Aaron Schrab's message of "Mon, 17 Nov 2014 17:38:36 -0500")
Aaron Schrab <aaron@schrab•com> writes:
> Is there a way to do a merge but only record conflicts in the index,
> not update the working versions of files with conflict markers?
Not with Porcelain, but "read-tree -m <ancestor> <ours> <theirs>"
should give you something close to it.
"merge-recursive" is probably beyond salvaging and coaxing --cached
option (i.e. tell a command that usually works both on the index and
on the working tree to only work on the index) into it would be too
messy to think about. Restructuring it so that it first computes
the end result only in the index and then optionally allows it to
check out to the working tree has been something I've wanted to do
for a long time, but there is only limited amount of time in a day
and the list is never dormant, so... X-<.
next prev parent reply other threads:[~2014-11-17 23:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 22:38 Merge without marking conflicts in working tree Aaron Schrab
2014-11-17 23:19 ` Junio C Hamano [this message]
2014-11-17 23:20 ` Andreas Schwab
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=xmqqzjbpwh35.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=aaron@schrab$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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