Smerge
A built-in minor mode for working with files with merge conflicts.
Automatically enabled by Magit after typing RET on a file with conflicts.
| Key | Description |
|---|---|
C-c ^ n |
move to the next conflict |
C-c ^ p |
move to the previous conflict |
C-c ^ u |
keep “upper” version |
C-c ^ l |
keep “lower” version |
C-c ^ RET |
keep version at point |