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.