Underdocumented

[billroper]

There is nothing quite like reading the instructions that someone has written for merging one branch into another using Git and discovering that you have merge conflicts and that there is nothing in the write up about how to resolve those conflicts with the tool that you are using.

Ah, well, I guess that's what search engines are for.