Microsoft/vscode

Git - Offer to pull from origin on failed git push

Open

#171,382 opened on Jan 16, 2023

View on GitHub
 (0 comments) (0 reactions) (1 assignee)TypeScript (10,221 forks)batch import
feature-requestgithelp wantedteam-low-hanging

Repository metrics

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

Description

Type: Feature Request

PyCharm allowed me to pull and potentially merge from origin if a push failed due to not being up-to-date on the local branch. Could VSCode do something similar?

VS Code version: Code 1.74.3 (97dec172d3256f8ca4bfb2143f3f76b503ca0534, 2023-01-09T17:05:47.808Z) OS version: Darwin arm64 21.6.0 Modes: Sandboxed: No

Contributor guide

Research direction
Examine the Git push failure handling in VS Code's built in Git extension (look in src/vs/workbench/contrib/git/) to detect when a push fails due to the remote having new commits. Then implement a dialog offering to pull and merge (or rebase) before retrying the push.
Tech stack
typescript
Domain
developer experience
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-2 days
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
GitTypeScript
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
70