microsoft / microsoft/vscode-pull-request-github

"Your branch is old, Would you like to pull" causing merge conflict

Abierto
#1,466 1 comentario 1 reacción 1 asignado Ver en GitHub

Nadie ha tomado este issue todavía.

bug
Lenguaje dominante
TypeScript
Estrellas
2.6k
Forks
796
Merge medio
1 d 4 h
PR fusionados (30 d)
46

Descripción

Not sure exact steps to get into this situation, but I had an old PR branch locally, the author added commits, rebased the whole thing onto master, then force pushed. I checked it out, and saw that the files were still in the old state.

I got a notification saying "This branch can be updated" or similar, but when I clicked "pull", I got a bunch of merge conflicts (the old changes conflicting with the new changes, when the new should have directly replaced the old, but didn't probably due to the force-push/rebase).

I ran git pull --abort to get back to the old state, than ran vscode's git sync (which for me does rebase, not sure if thats relevant), and ended up in the correct state. Perhaps the "Pull" button should trigger a git sync? Though that might push bad commits so I'm not sure.

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.