microsoft / microsoft/vscode-pull-request-github

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

Offen
#1,466 1 Kommentar 1 Reaktion 1 zugewiesene Person Auf GitHub ansehen

Dieses Issue hat noch niemand übernommen.

bug
Vorherrschende Sprache
TypeScript
Sterne
2.6k
Forks
796
Ø Merge
1 T. 4 Std.
Gemergte PRs (30 T.)
46

Beschreibung

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.

Beitragsleitfaden

Für dieses Repository ist kein Beitragsleitfaden indexiert

Erste Schritte

  1. Lies das ganze Issue und danach den Beitragsleitfaden des Projekts.
  2. Schreib ins Issue, dass du es übernimmst — das erspart doppelte Arbeit.
  3. Forke das Repository und arbeite in einem Branch.
  4. Öffne einen Pull Request, der die Issue-Nummer nennt.

Bewertung

Dieses Issue wurde noch nicht bewertet.

Neue Issues direkt in Ihr Postfach

Eine kurze Übersicht über anfängerfreundliche GitHub-Issues.