recentpopularlog in


« earlier   
Magit tutorial - Rebase (Part II)
In this part, we will talk about another common use case of rebase: rebase before merging branches, where the last commits in master and feature are conflicting each other.
magit  rebase 
april 2019 by iyoti
Use magit-ediff to resolve merge conflicts (Example)
You can always just switch to buffer C and edit what the merged version should look like.
emacs  git  magit 
february 2019 by cjitlal

Copy this bookmark:

to read