copier: Inline conflicts should use standard git markers

Actual Situation

I am using copier 8.3.0. When updating a rendered project that diverged from the template, inline markers are added to files with conflicts. These markers are custom to copier and therefore not recognized by git or my IDE.

Desired Situation

The marker should use the standard git notation and set the status of the destination git repository to “conflicts”. Similar to how https://github.com/cruft/cruft leaves the conflicting files after a failed git apply <patch>.

Proposed solution

Would this not solve many problems elegantly? It would not only get rid of the need to use pre-commit to prevent pushing conflicting files, as git would not allow commiting the working tree in “conflicting files” state. Moreover, my IDE’s git integration would help me to solve conflicts visually (using, for example, the brilliant 3-way-merge tool of Jetbrains or VSCode).