Auto resolve conflicts


Hello :slight_smile:,

I’m looking for a way to automatically resolve conflicts by always choosing the newest file. Is there an built in way to configure this? If not, maybe a Windows Batch script?

(Jakob Borg) #2

Conflicts are already automatically resolved, it’s just that a backup is created of the losing file. There is an (advanced?) folder config for the number of conflict backups to keep around. Set this to zero and you’ll get no conflict files.