From: Junio C Hamano <gitster@pobox.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: "André Hänsel" <andre@webkr.de>, git@vger.kernel.org
Subject: Re: git merge --abort deletes unstaged files
Date: Mon, 15 Sep 2014 12:25:25 -0700 [thread overview]
Message-ID: <xmqq61go65zu.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <87k354x0qt.fsf@igel.home> (Andreas Schwab's message of "Mon, 15 Sep 2014 19:16:42 +0200")
Andreas Schwab <schwab@linux-m68k.org> writes:
> André Hänsel <andre@webkr.de> writes:
>
>> I ran git merge to merge a branch. There were some conflicted files.
>> Although they were automatically resolved by git rerere, I still had to add
>> them.
>
> If you want them to be added automatically, set rerere.autoupdate=true.
I would have to caution against doing so without thinking, though.
In other words, it is OK if you are Andreas who knows what he is
doing, but it is not a very good advice to give to random newbies.
"rerere" will apply whatever matching previous resolution, which may
hopefully be the correct resolution this time too, but it is a good
habit to get into to double check if such a merely textual side-port
of previous resolution is really applicable to the current conflict.
next prev parent reply other threads:[~2014-09-15 19:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 15:43 git merge --abort deletes unstaged files André Hänsel
2014-09-15 17:16 ` Andreas Schwab
2014-09-15 19:25 ` Junio C Hamano [this message]
2014-09-15 21:54 ` Andreas Schwab
2014-09-15 22:02 ` Junio C Hamano
2014-09-15 22:28 ` 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=xmqq61go65zu.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=andre@webkr.de \
--cc=git@vger.kernel.org \
--cc=schwab@linux-m68k.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 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.