merge

There are plenty of git cheatsheets on the web (Tower’s is my favorite), but many of them are lacking answers to the most common questions about workflow practices and dealing…