oca-copier-update is committing merge conflicts

[sbidoul]

See for instance: OCA/server-ux#1025

Historically, this did not happen because copier did create .rej files which where in turned causing pre-commit to fail due to this:

https://github.com/OCA/server-ux/blob/42089781bde9cb059a2a30217859e1fd8e4121c6/.pre-commit-config.yaml#L29-L35

I don't know why this mechanism does not appear to work anymore.

[sbidoul]

@yajo I'm under the impression that before copier update was returning a non-zero exit code when it creates merge conflicts and that is not the case with the latest copier version. Do you know something about that?

[yajo]

More modern copier writes merge conflicts instead of adding .rej files. The thing that was preventing those from being merged is this hook.

We can add another hook as documented here to get the same behavior with merge conflicts.

Another option is to run with copier update --conflict rej to keep the old behavior. However, I think that having both hooks in place is better.

[sbidoul]

Ah, right. Thanks!