Use new "merge twice" algorithm to resolve push conflicts #1279
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
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
from
a0675d7 to
cf71202
Compare
RalfJung
reviewed
Sep 10, 2023
RalfJung
reviewed
Sep 10, 2023
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
from
49d5e54 to
b93937f
Compare
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
from
b93937f to
a4015fe
Compare
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
from
a4015fe to
4a9c81e
Compare
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
2 times, most recently
from
fd2938a to
c92b9da
Compare
Change: merge-twice
christian-schilling
force-pushed
the
@changes/master/[email protected]/merge-twice
branch
from
c92b9da to
1fd2170
Compare
christian-schilling
deleted the
@changes/master/[email protected]/merge-twice
branch
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.
Change: merge-twice