Re: [PATCH 0/2] Update the die() preserve-merges messages to help some users

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Feb 22, 2022, 18:55 UTC
Message-ID: <8b95ac6e-5e9d-38e4-4729-dbbe4b671ea8@gmail.com>
In-Reply-To: <pull.1155.git.1645526016.gitgitgadget@gmail.com>

Hi Philip

On 22/02/2022 10:33, Johannes Schindelin via GitGitGadget wrote:

Show 9 quoted lines

> This small update to the die() preserve-merges messages is a response to the
> reported edge case in the Git-for-Windows googlegroups thread
> [https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM] where even git
> rebase --continue would die.
> 
> It is most relevant for Windows because Visual Studio still offers the
> option to run git pull --preserve, therefore Git for Windows already applied
> these patches. The improvements are not specific to Windows, though, and
> should therefore also get into core Git, albeit at a more leisurely pace.

I think the new messages are an improvement, I was wondering how difficult it would be to allow the user to run rebase --abort so they can at least easily start again with --rebase-merges.

Best Wishes

Phillip

Show 15 quoted lines

> This is a companion patch series to
> https://github.com/git-for-windows/git/pull/3708
> 
> Philip Oakley (2):
>    rebase: help user when dying with preserve-merges`
>    rebase: `preserve` is also a pull option, tell dying users
> 
>   builtin/rebase.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
> 
> 
> base-commit: e6ebfd0e8cbbd10878070c8a356b5ad1b3ca464e
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1155%2Fdscho%2Fdie_preserve-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1155/dscho/die_preserve-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1155