Context
As updates are effectively copying and merging files, conflicts can arise, any improvements in resolving those automatically would streamline the update process.
Mergiraf is a more syntax/language aware merge tool.
This may eventually be integrated in Copier upstream (see groundwork being laid in copier-org/copier#2376)
Implementation
The first pass effort may just be having someone commit to using mergiraf as their merge driver for some updates and see if it feels like an anecdotal improvement compared to previous experiences.
More measurably we could set up some test scenarios of the kind of project divergences that we've seen create conflicts in the past and compare the results with/without mergiraf. These scenarios could be nice to capture as actual e2e tests for the CLI as well.
Context
As updates are effectively copying and merging files, conflicts can arise, any improvements in resolving those automatically would streamline the update process.
Mergiraf is a more syntax/language aware merge tool.
This may eventually be integrated in Copier upstream (see groundwork being laid in copier-org/copier#2376)
Implementation
The first pass effort may just be having someone commit to using mergiraf as their merge driver for some updates and see if it feels like an anecdotal improvement compared to previous experiences.
More measurably we could set up some test scenarios of the kind of project divergences that we've seen create conflicts in the past and compare the results with/without mergiraf. These scenarios could be nice to capture as actual e2e tests for the CLI as well.