ACE Git — remotes + merge/conflict

Multi-remote

1. Enter remote name (origin, upstream, …) + URL.
2. Click Set Remote.
3. Use the remote dropdown to choose which remote Fetch / Pull / Push use.

Merge + conflicts

1. Stay on the branch that should receive changes (e.g. master).
2. In Merge, pick the other branch (e.g. ACE_BRANCH) → Merge.
3. If conflicts appear:
   • Open — edit markers in the editor
   • Ours — keep current branch version
   • Theirs — take incoming branch version
   • Mark — after manual edit, stage as resolved
4. When the conflict list is empty → Continue
5. To cancel the merge → Abort

Pull conflicts use the same conflict list + Continue/Abort flow.

Quick checks

• Two remotes (origin + upstream) switch in the dropdown; Push hits the selected one.
• Merge with overlapping edits shows conflict rows.
• Abort restores pre-merge state.
• Continue creates the merge commit after all conflicts are resolved.