Have you never got large merge conflicts because one branch made some changes to a block of code, and the other left it intact but changed its indentation? Tha

Have you never got large merge conflicts because one branch made some changes to a block of code, and the other left it intact but changed its indentation? That kind of thing would not happen in a better representation.