From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: "git rm" is not a valid merge resolution?
Date: Mon, 21 Mar 2011 21:01:07 +0100 [thread overview]
Message-ID: <4D87AE83.6080008@gmail.com> (raw)
In-Reply-To: <7vvczcp8w7.fsf@alter.siamese.dyndns.org>
W dniu 21.03.2011 20:32, Junio C Hamano pisze:
> Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:
>
>> git-status shows a hint that says
>> use "git add/rm <file>..." as appropriate to mark resolution
>>
>> But if I "git rm file" the file gets deleted. Is this really the
>> appropriate merge resolution?
>>
>> I would expect "git rm" to maybe reset all the merge changes but
>> it seems to just delete the file.
>
> Yes, if your side has a commit that updates a path since branches forked
> (e.g. fixing a minor bug in an implementation of a function defined
> there), and the other branch you are merging removed the path (e.g. fixing
> a higher level callers and made that buggy function no longer necessary),
> taking their removal can be a valid conflict resolution.
Please see my other mail - file deletion can also be done by "git add".
I feel that suggesting something that is wrong in most cases is wrong :)
--
Piotr Krukowiecki
next prev parent reply other threads:[~2011-03-21 20:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 18:27 "git rm" is not a valid merge resolution? Piotr Krukowiecki
2011-03-21 18:35 ` Matthieu Moy
2011-03-21 19:56 ` Piotr Krukowiecki
2011-03-21 19:32 ` Junio C Hamano
2011-03-21 20:01 ` Piotr Krukowiecki [this message]
2011-03-21 20:24 ` Junio C Hamano
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=4D87AE83.6080008@gmail.com \
--to=piotr.krukowiecki@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.