One single merge conflict is pretty easy to solve. However, you might take several days before realizing there is one conflict. The longer you wait, the more conflicts you will have to solve. Overlooking them will lead you to a merge hell. Baboon is a lightweight daemon that detects merge conflicts in realtime.