How to use magit
— Albert De La Fuente VigliottiTable of Contents
- confidence
- certain/highly likely/likely/possible/unlikely/highly unlikely/remote/impossible
- importance
- 9⁄10
Merge and conflict resolution #
- Merge with
SPC g m
and select the patch branch you want to merge - Use
SPC g r
to callsmerge
transient state and usen
ando
accordingly if you want to keep the “others” version