Microsoft/vscode

Git - error while synching changes

Open

#198,210 opened on Nov 14, 2023

View on GitHub
 (0 comments) (0 reactions) (1 assignee)TypeScript (10,221 forks)batch import
buggithelp wanted

Repository metrics

Stars
 (74,848 stars)
PR merge metrics
 (Avg merge 11h 43m) (1,000 merged PRs in 30d)

Description

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.

Contributor guide

Research direction
Inspect the 'Sync Changes' handler in VS Code's git extension to understand how it performs pull and push. Focus on the case where remote has diverged and the current git pull command fails due to missing merge strategy. Look for where the pull command is constructed and see if it should use ff only or handle divergent branches gracefully.
Tech stack
typescript
Domain
developer experiencebackend
Issue type
Bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
2
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitVS Code extension development
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
75