Comment by DonThomasitos

Everything in git can and must be merge-able when merging branches. After all, git is a collaboration tool, not a undo-redo stack.