Table of Contents

• Overview
• Reference
• Terminology
• Topics
• How-to
  • Resolve a conflict
• Links

Overview

Reference

Terminology

Topics

How-to

Resolve a conflict

On master branch

print 'foo'

On bar branch

print 'bar'

• On master branch, do merge by pressing m, m::

• Select bar branch

• On the conflicted file, press e (Ediff dwimming)

Buffer A, on the left

Contains the content of MINE, ours, etc.

Buffer B, on the right

Contains the content of OTHER, theirs, etc.

Buffer C, on the bottom

Contains the merge result. Can edit the content directly

X or x in Quick Help

Stands for A or B, a or b.

Links