pull without rebase #1
Closed
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
As described in wireframe#52, when the developer has `pull.rebase = true` in their git config, they will get an error when updating due to git attempting to rebase local changes on top of a different remote HEAD. The error can unfortunately be fairly opaque and confusing (e.g. `Updates were rejected because the tip of your current branch is behind`). This fixes the issue by doing a plain merge instead of a rebase.
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.
Summary
Pull without rebase
Context
As described in wireframe#52, when the developer has
pull.rebase = truein their git config, they will get an error when updating due to git attempting to rebase local changes on top of a different remote HEAD. The error can unfortunately be fairly opaque and confusing (e.g.Updates were rejected because the tip of your current branch is behind). This fixes the issue by doing a plain merge instead of a rebase.I also updated to Ruby 3.3.0 since support for 2.7.x ended 10 months ago.
Guidance
Any concerns?