VS Code config: Enable git.rebaseWhenSync #65
Merged
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
Contributor
Author
|
I want to dog-food this setting for a while before I merge this. |
drothlis
force-pushed
the
vscode-rebase
branch
from
c2a8a3b to
b640eb8
Compare
Otherwise pressing the sync button when there are upstream changes (e.g. commits created on the Stb-tester Portal, such as new AI training screenshots or new Page Objects) fails, with this in the logs: > You have divergent branches and need to specify how to reconcile them. > You can do so by running one of the following commands sometime before > your next pull: > > git config pull.rebase false # merge (the default strategy) > git config pull.rebase true # rebase > git config pull.ff only # fast-forward only
drothlis
force-pushed
the
vscode-rebase
branch
from
b640eb8 to
47c4f12
Compare
Contributor
|
This came up again recently in a trial. I think it's the right thing to do, at least if it doesn't override existing preference. |
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.
Otherwise pressing the sync button when there are upstream changes (e.g. commits created on the Stb-tester Portal, such as new AI training screenshots or new Page Objects) fails, with this in the logs: