Files
skillshare/internal
Willie 51af1d30ba fix(git): recover when two machines push to the same source repo
Once both machines committed, the UI push was rejected and the follow-up
pull failed with "Need to specify how to reconcile divergent branches",
leaving no way out without a terminal. Pull now merges explicitly and
aborts a conflicted merge so a later commit-all cannot push conflict
markers; a rejected push returns push_rejected so the UI offers Pull.
2026-09-25 02:18:00 +08:00
..
2026-06-05 13:56:07 +08:00
2026-04-14 18:16:11 +08:00