

Mate, he is on a very self destructive spiral doing those nazi salutes at the inauguration. That’s not a smart move. He’s let his fantasies get the better of him. If he was really smart he would shut the fuck up about politics. He has everything, And consequently he values nothing.
Magit for Emacs is an excellent tool for resolving conflicts.