Repository navigation
Simplify choices in update conflict resolution - #237
Merged
Merged
Conversation
micprog
force-pushed
the
simple_conflict
branch
2 times, most recently
from
December 11, 2025 15:31
fbf0722 to
7197aa3
Compare
fischeti
approved these changes
Jan 6, 2026
micprog
force-pushed
the
simple_conflict
branch
from
January 6, 2026 17:10
7197aa3 to
3bf859b
Compare
micprog
force-pushed
the
simple_conflict
branch
from
January 6, 2026 17:10
3bf859b to
ce5a1ef
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.