cli: Add prev/next --conflict, which allows you to jump to the next conflict.
#3248
Conversation
This file contains 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
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
from
cf04fd0
to
409b105
Compare
PhilipMetzger
commented
Mar 7, 2024
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
2 times, most recently
from
d068fc8
to
46c0987
Compare
|
This is actually ready for review, I just need some help to finish the tests. I am seemingly unable to introduce the conflicts I want in my tests :-/. |
What do you need help with? Did you try searching the tests for "conflict"? Are you looking for something different? |
noahmayr
reviewed
Apr 30, 2024
noahmayr
force-pushed
the
push-ntzqtqnuwrwy
branch
from
27ed987
to
63ba6f3
Compare
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
4 times, most recently
from
7ee55c8
to
ce831db
Compare
martinvonz
reviewed
May 12, 2024
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
3 times, most recently
from
10ea3dc
to
1ed88b1
Compare
martinvonz
reviewed
May 18, 2024
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
from
1ed88b1
to
0fcba44
Compare
martinvonz
reviewed
May 18, 2024
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
from
0fcba44
to
b21081f
Compare
martinvonz
reviewed
May 24, 2024
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
from
b21081f
to
c2c23b2
Compare
martinvonz
reviewed
May 24, 2024
|
After thinking a bit on during my holiday, I'm fine with either version. I'd like to land this ASAP though, so I can finally spend my owed time to |
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
2 times, most recently
from
64d4856
to
e2a0017
Compare
This allows users to easily filter a commit range by conflicts, which will be needed for `next/prev` further down in the next commit. Users which benefit from it were also migrated.
This allows users to jump to the next conflict in the ancestors or children of the start commit. Continues work on #2126 Co-Authored-By: Noah Mayr <dev@noahmayr.com>
PhilipMetzger
force-pushed
the
push-ntzqtqnuwrwy
branch
from
e2a0017
to
02021e9
Compare
fowles
reviewed
Jun 20, 2024
fowles
approved these changes
Jun 20, 2024
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.
Tests are complete, although I need help there.
Checklist
If applicable:
CHANGELOG.md