FAQ: Answer on how to revert merge commits #6828
Open
+21
−0
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
joyously
reviewed
Jun 25, 2025
joyously
reviewed
Jun 25, 2025
PhilipMetzger
force-pushed
the
pm/push-zwmmvquwyxwr
branch
from
ce916d7 to
8fd12fb
Compare
yuja
reviewed
Jun 26, 2025
PhilipMetzger
force-pushed
the
pm/push-zwmmvquwyxwr
branch
from
8fd12fb to
491f5ad
Compare
yuja
approved these changes
Jun 28, 2025
ilyagr
reviewed
Jun 28, 2025
ilyagr
reviewed
Jun 28, 2025
This is idiosyncratic to new users coming from Git, since `jj revert <merge>` does not usually do what users want. Maybe a followup could be adding a warning in `jj revert`. The explanation is from a Discord message from Austin.
PhilipMetzger
force-pushed
the
pm/push-zwmmvquwyxwr
branch
from
491f5ad to
156d3c5
Compare
|
I'm going to wait for Ilya's approval before landing it. |
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.
This is idiosyncratic to new users coming from Git, since
jj revert <merge>does not usually do what users want. Maybe a followup could be adding a warning injj revert.The explanation is from a Discord message from Austin.
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)