microsoft / microsoft/vscode-pull-request-github

Deal with a force-pushed PR branch

Open
#802 2 comments 10 reactions 1 assignee View on GitHub

@alexr00 is already working on this.

Since Dec 13, 2022.

feature-request
Dominant language
TypeScript
Stars
2.6k
Forks
795
Avg merge
1d 4h
Merged PRs (30d)
46

Description

  • A PR branch is force-pushed
  • PR extension notifies me that the PR has updates
  • I click "pull"
  • Now I have to merge changes between the two versions of the branch

Currently I have to go to the command line myself to reset the branch to the upstream version which is annoying, because this is a common PR workflow. I think the typical way to do this is to fetch, then git reset --hard upstream/branch.

There should somehow be an option to reset my branch to the upstream branch. If the local commits are my own commits, we wouldn't want to lose those, so maybe there should be a separate button, or the extension can notify me after I click "pull" and ask me whether to merge or reset. Either way there should be some SCARY TEXT so I know that commits will be lost...

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.