Microsoft/vscode

Git - error while synching changes

Open

#198,210 opened on 2023年11月14日

GitHub で見る
 (0 comments) (0 reactions) (1 assignee)TypeScript (10,221 forks)batch import
buggithelp wanted

Repository metrics

Stars
 (74,848 stars)
PR merge metrics
 (平均マージ 11h 43m) (30d で 1,000 merged PRs)

説明

Steps to Reproduce:

  1. Launch VS Code, and open a folder/workspace that contains a git repository
  2. Ensure that auto fetch is disabled, and git.rebaseWhenSync is disabled
  3. Make a change locally and commit the change
  4. Make a change in the remote, but do not fetch/pull it
  5. 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.

コントリビューターガイド