microsoft / microsoft/vscode-pull-request-github

Deal with a force-pushed PR branch

Abierto
#802 2 comentarios 10 reacciones 1 asignado Ver en GitHub

@alexr00 ya está trabajando en esto.

Desde el 13/12/2022.

feature-request
Lenguaje dominante
TypeScript
Estrellas
2.6k
Forks
795
Merge medio
1 d 4 h
PR fusionados (30 d)
46

Descripción

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

Guía de contribución

No hay ninguna guía de contribución indexada para este repositorio

Primeros pasos

  1. Lee el issue completo y luego la guía de contribución del proyecto.
  2. Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
  3. Haz un fork del repositorio y trabaja en una rama.
  4. Abre un pull request que haga referencia al número del issue.

Evaluación

Este issue todavía no se ha evaluado.

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.