Merge conflicts in #git are still the hardest work I have to do related to working on a team (I’m not counting code-review). The things I do to branches are probably more complicated than I need them to be. But I’ve found something else in git that takes effort: managing the #gitstash. At this moment I have six entries in my stash. Deciding which ones to keep and which ones to drop and all the commands to manipulate and all the things you can’t do (like renaming entries). Annoying.