Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deal with a force-pushed PR branch #802

Open
roblourens opened this issue Jan 9, 2019 · 0 comments
Open

Deal with a force-pushed PR branch #802

roblourens opened this issue Jan 9, 2019 · 0 comments
Assignees
Labels
feature-request Request for new features or functionality

Comments

@roblourens
Copy link
Member

roblourens commented Jan 9, 2019

  • 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...

@RMacfarlane RMacfarlane added the feature-request Request for new features or functionality label May 1, 2019
@meaghanlewis meaghanlewis mentioned this issue May 21, 2019
6 tasks
@alexr00 alexr00 self-assigned this Dec 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-request Request for new features or functionality
Projects
None yet
Development

No branches or pull requests

4 participants
@roblourens @RMacfarlane @alexr00 and others