FastForward merge should block if there are checkout conflicts. #781
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
Currently, if there are changes in your working directory and a fastforward merge would update those files, the checkout that is performed as part of the fast forward will skip over these files. This change fixes and adds regression tests around this behavior.
Member
|
Thanks for this @jamill , this looks good to me. |
Member
|
👍 |
Member
|
⚡ |
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.
Currently, if there are changes in your working directory and
a fastforward merge would update those files, the checkout
that is performed as part of the fast forward will skip over
these files. This change fixes and adds regression tests around
this behavior.
Originally, we needed to pass in the
GIT_CHECKOUT_ALLOW_CONFLICTSflag for the merge calls, but this flag should not be passed in during the fast-forward update. There have been updates for libgit2 since this was originally implemented where this flag should not even be passed to the merge calls./cc @ethomson