I love that CLion’s Git merge UI understands the idea of wanting to pick which of two conflicting chunks to insert in the file first (like, when two functions were added to the same spot in a file, and you want both, in a particular order).