Require --ff on pull #152
Merged
Require --ff on pull #152
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
A globally-set --ff-only means a git pull will refuse to fall back to merge commit if a fast forward cannot be set. This causes sync errors more frequently. Let's prefer setting --ff explicitly, making the choice on behalf of the user to prefer merge commits to failures. The only downside is the non-linear commit history, but this seems minor, given our use case. See `git pull --help`
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.
A globally-set --ff-only means a git pull will refuse to fall back to
merge commit if a fast forward cannot be set. This causes sync errors
more frequently.
Let's prefer setting --ff explicitly, making the choice on behalf of the
user to prefer merge commits to failures. The only downside is the
non-linear commit history, but this seems minor, given our use case.
See
git pull --help