590
Commit
(sh.itjust.works)
Post funny things about programming here! (Or just rant about your favourite programming language.)
Magit for Emacs is an excellent tool for resolving conflicts.