← Back to team overview

ubuntuone-users team mailing list archive

How to resolve conflicts?

 

hi ,

I have a folder called wiki/ in UbuntuOne which is synced between two
9.10 machines. In last sync on one of the machine , conflict is
encountered. Then ubuntuone renamed the folder to wiki.u1conflicts
with nothing changed. It didn't told which files are conflict , so I
just rename the folder back to wiki/ , but soon after the sync
finished, the folder will rename to wiki.u1conflicts again!

How can I know which files are conflict , and resolve it?

thx



Follow ups