From: "goldofzky@gmail.com" <goldofzky@gmail.com>
To: gitster <gitster@pobox.com>, gitgitgadget <gitgitgadget@gmail.com>
Cc: git <git@vger.kernel.org>, "Kyle Zhao" <kylezhao@tencent.com>
Subject: Re: Re: [Internet]Re: [PATCH v5] merge: avoid write merge state when unable to write index
Date: Mon, 17 Jun 2024 17:17:29 +0800 [thread overview]
Message-ID: <202406171717292856283@gmail.com> (raw)
In-Reply-To: 202406171101133354904@gmail.com
> [2] From a usability perspective, the merge state should not be written when the index is being
> written (merge conflicts are not considered failures). To avoid losing changes in the source branch,
"the merge state should not be written when the index is being written" should be:
the merge state should not be written if the index write fails.
> users can only execute 'git merge --abort' and try 'git merge' again. However, if the merge state is
> not written in the first place, the user only needs to retry 'git merge'.
>In other words, writing the merge state after the index write fails is meaningless and could
>potentially cause Git to lose changes.
next prev parent reply other threads:[~2024-06-17 9:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 5:08 [PATCH] merge: avoid write merge state when unable to write index Kyle Zhao via GitGitGadget
2024-05-16 5:18 ` [PATCH v2] " Kyle Zhao via GitGitGadget
2024-05-16 16:18 ` Junio C Hamano
2024-05-17 3:47 ` [PATCH v3] " Kyle Zhao via GitGitGadget
2024-05-17 4:41 ` [PATCH v4] " Kyle Zhao via GitGitGadget
2024-06-12 2:40 ` goldofzky
2024-06-12 6:27 ` [PATCH v5] " Kyle Zhao via GitGitGadget
2024-06-13 17:27 ` Junio C Hamano
2024-06-17 3:02 ` [Internet]Re: " goldofzky
2024-06-17 9:17 ` goldofzky [this message]
2024-06-17 3:08 ` [PATCH v6] " Kyle Zhao via GitGitGadget
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=202406171717292856283@gmail.com \
--to=goldofzky@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=kylezhao@tencent.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.