With regards to merging, I prefer using a merge tool such as Meld. Whenever you're in a merge conflict, just run git mergetool. Meld is pretty easy to learn as

With regards to merging, I prefer using a merge tool such as Meld. Whenever you're in a merge conflict, just run git mergetool. Meld is pretty easy to learn as long as you know to use shift-click to delete a chunk and ctrl-click to copy a chunk instead of replacing.