Albert

Posts tagged with ‘git’ (1)

How to use magit

confidence
certain/highly likely/likely/possible/unlikely/highly unlikely/remote/impossible
importance
910

Merge and conflict resolution

  1. Merge with SPC g m and select the patch branch you want to merge
  2. Use SPC g r to call smerge transient state and use n and o accordingly if you want to …