How do I resolve conflict files?

Created by Joshua Hoover on on 2009-09-03
Keywords:
conflicts
Last updated by:
Joshua Hoover on on 2009-09-03

The way to resolve conflicts is to pick from the original file (if there is one) and the conflict file that you wish to keep and to delete the conflict file or move the conflict file over the original one, depending on your choice.

How do you select which file you want to keep? That really depends on the kind of files you have.

.u1conflict[.NN] files are ignored by ubuntuone. So you can either leave them around or delete them if you dont need them.