buggithelp wanted
仓库指标
- Star
- (74,848 star)
- PR 合并指标
- (平均合并 11小时 43分钟) (30 天内合并 1,000 个 PR)
描述
Steps to Reproduce:
- Launch VS Code, and open a folder/workspace that contains a git repository
- Ensure that auto fetch is disabled, and
git.rebaseWhenSyncis disabled - Make a change locally and commit the change
- Make a change in the remote, but do not fetch/pull it
- Switch to VS Code and click the "Sync Changes" button
> git pull --tags origin main
From https://github.com/lszomoru/GitPlayground
* branch main -> FETCH_HEAD
5a76c29..d6d1cdb main -> origin/main
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.