From: Felipe Contreras <felipe.contreras@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>,
Felipe Contreras <felipe.contreras@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, David Aguilar <davvid@gmail.com>
Subject: Re: The git spring cleanup challenge
Date: Wed, 02 Jun 2021 01:53:04 -0500 [thread overview]
Message-ID: <60b72ad0ccc57_501332083f@natae.notmuch> (raw)
In-Reply-To: <9fb1f823-44f8-8046-adb5-d2c0fdb6b5a0@kdbg.org>
Johannes Sixt wrote:
> Am 02.06.21 um 01:44 schrieb Felipe Contreras:
> > Junio C Hamano wrote:
> >> Junio C Hamano <gitster@pobox.com> writes:
> >>> David Aguilar <davvid@gmail.com> writes:
> >
> >>>> +1 for merge.conflictstyle = diff3, rerere.enabled = true, and
> >>>> log.decorate = short from me. I noticed others already mentioned
> >>>> these.
>
> Does diff3 conflict style reduce conflicts to their minimum?
The objective is to resolve conflicts, not to see minimum conflicts.
> >>> As the inventor of rerere, I agree on rerere.enabled. It was made
> >>> opt-in only because I thought it was somewhat risky when the feature
> >>> was introduced, but it has been stable and useful, and it is long
> >>> overdue to be enabled by default.
> >>
> >> Just to make sure, rerere.enabled is fine, but as I am not
> >> comfortable to recommend rerere.autoupdate to any human users, I
> >> would be opposed to turning it on by default. Giving people a
> >> choice is fine, but the default should be a safe one that offers
> >> users a chance of final sanity checking before proceeding.
> >
> > No commit is made. Doesn't `git diff --staged` offer users such chance?
>
> rerere.autoupdate erases the information which files had conflicts. In
> my workflow, the rerere database time and again does hold outdated merge
> resolutions. I want to have an opportunity to cross-check the automatic
> resolutions, and for that I need to know which files had conflicts.
Then do rerere.autoupdate=false.
Defaults are not for you, they are for the majority of users.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-02 6:53 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 6:24 The git spring cleanup challenge Felipe Contreras
2021-06-01 7:28 ` Andy
2021-06-01 10:07 ` Felipe Contreras
2021-06-01 7:47 ` Đoàn Trần Công Danh
2021-06-01 10:48 ` Felipe Contreras
2021-06-01 11:40 ` Đoàn Trần Công Danh
2021-06-01 12:21 ` Felipe Contreras
2021-06-01 12:28 ` Đoàn Trần Công Danh
2021-06-01 13:14 ` Felipe Contreras
2021-06-02 4:13 ` Đoàn Trần Công Danh
2021-06-02 4:53 ` Felipe Contreras
2021-06-03 8:03 ` Ævar Arnfjörð Bjarmason
2021-06-03 10:06 ` Felipe Contreras
2021-06-03 10:49 ` Sergey Organov
2021-06-03 12:18 ` Ævar Arnfjörð Bjarmason
2021-07-02 10:12 ` Felipe Contreras
2021-07-02 11:43 ` Ævar Arnfjörð Bjarmason
2021-07-02 21:54 ` Felipe Contreras
2021-06-01 21:56 ` David Aguilar
2021-06-01 22:28 ` Junio C Hamano
2021-06-01 22:49 ` Junio C Hamano
2021-06-01 23:44 ` Felipe Contreras
2021-06-02 6:47 ` Johannes Sixt
2021-06-02 6:53 ` Felipe Contreras [this message]
2021-06-02 11:00 ` Junio C Hamano
2021-06-02 11:24 ` Felipe Contreras
2021-06-02 11:44 ` Đoàn Trần Công Danh
2021-06-02 18:13 ` Johannes Sixt
2021-06-01 23:12 ` Felipe Contreras
2021-06-02 12:13 ` Sergey Organov
2021-06-03 3:00 ` Junio C Hamano
2021-06-03 10:00 ` Sergey Organov
2021-06-01 22:33 ` Sergey Organov
2021-06-01 23:19 ` Felipe Contreras
2021-06-02 12:19 ` Sergey Organov
2021-06-02 21:28 ` Felipe Contreras
2021-06-02 22:05 ` Sergey Organov
2021-06-02 22:33 ` Felipe Contreras
2021-06-02 23:09 ` Sergey Organov
2021-06-03 0:06 ` Junio C Hamano
2021-06-03 0:48 ` Felipe Contreras
2021-06-03 0:26 ` Elijah Newren
2021-06-03 1:36 ` Felipe Contreras
2021-06-03 4:25 ` Elijah Newren
2021-06-03 9:52 ` Felipe Contreras
2021-06-03 9:48 ` Sergey Organov
2021-06-02 3:43 ` Bagas Sanjaya
2021-06-02 3:59 ` Felipe Contreras
2021-06-03 8:15 ` Ævar Arnfjörð Bjarmason
2021-06-03 11:09 ` Felipe Contreras
2021-06-03 12:31 ` Ævar Arnfjörð Bjarmason
2021-06-03 14:28 ` Phillip Wood
2021-06-03 16:44 ` Ævar Arnfjörð Bjarmason
2021-06-04 10:24 ` Phillip Wood
2021-06-03 17:28 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60b72ad0ccc57_501332083f@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).