Posts categorized in ‘git’ (1)

confidence

certain/highly likely/likely/possible/unlikely/highly unlikely/remote/impossible

importance

9/10

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 keep the …