Online

Push Pull

Conflicts:

• Use local {{conflict.source.name || "(removed)"}} Use remote {{conflict.target.name || "(removed)"}}

• {{color.conflict}} delete