Update the die() preserve-merges messages to help some users #3708
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git will die if a "rebase --preserve-merges" is in progress. Users cannot --quit, --abort or --continue the rebase. This sceario can occur if the user updates their Git, or switches to another newer version, after starting a preserve-merges rebase, commonly via the pull setting. One trigger is an unexpectedly difficult to resolve conflict, as reported on the `git-users` group. (https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM) Tell the user the cause, i.e. the existence of the directory. The problem must be resolved manually, `git rebase --<option>` commands will die, or the user must downgrade. Also, note that the deleted options are no longer shown in the documentation. Signed-off-by: Philip Oakley <[email protected]>
The `--preserve-merges` option was removed by v2.35.0. However users may not be aware that it is also a Pull option, and it is still offered by major IDE vendors such as Visual Studio. Extend the `--preserve-merges` die message to direct users to this option and it's locations. Signed-off-by: Philip Oakley <[email protected]>
dscho
approved these changes
Feb 22, 2022
dscho
added a commit
that referenced
this pull request
Feb 22, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 22, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 22, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 22, 2022
Update the die() preserve-merges messages to help some users
|
Thank you @dscho , and thank you for pushing it forward to GGG. Hopefully Microsoft will pick up on the needed updates to Visual Studio's Git integration. |
dscho
added a commit
that referenced
this pull request
Feb 24, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 24, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 24, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Feb 25, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 1, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 1, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 1, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 1, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 1, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 2, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 2, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 3, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 4, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 7, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 7, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 8, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 9, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Mar 9, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 31, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 31, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 31, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 1, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 1, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 1, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 2, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 2, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 2, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 2, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 3, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 3, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 3, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 3, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 5, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 7, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 7, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 8, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 8, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 9, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 13, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 13, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 13, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 14, 2022
Update the die() preserve-merges messages to help some users
mjcheetham
pushed a commit
to mjcheetham/git
that referenced
this pull request
Jun 14, 2022
Update the die() preserve-merges messages to help some users
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 15, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 15, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 18, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 23, 2022
Update the die() preserve-merges messages to help some users
dscho
added a commit
that referenced
this pull request
Jun 27, 2022
Update the die() preserve-merges messages to help some users
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
This small update to the die() preserve-merges messages is a response to the reported edge case in the Git-for-Windows googlegroups thread where even
git rebase --continuewould die.The
preserveoption is still offered in the latest editions of Visual Studio (*), despite being deprecated for a long time, so the potential for unfamiliar users to fall into the same possible traps of running a pull-preserve (then with conflicts) on mixed Git versions could still occur. E.g. if the repo is on a network drive, and different users, with different Git versions collaborate on fixing conflicts.Let's beef up the die messages to point users toward these resolutions.
(*) I have logged a feedback with Visual Studio that the Preserve setting should be removed, but initially they redirected it to different issue. I've responded.
Philip