All Scenarios
⚔️Collaboration
Resolving a Merge Conflict
Two branches change the same lines. Read the conflict markers, resolve, and finish the merge.
0.0s / 124s
commitring = the commit HEAD is onunreachable (still exists)branch = movable labelorigin/* = your bookmark of the remoteHEAD = where you are