← Back to team overview

ubuntuone-users team mailing list archive

Re: How to resolve conflicts?

 

I have the same problem. My files all got the suffix .uiconflicts and they
are no longer synchronized with files on the UbuntuOne server. On UbuntuOne
server side (I accessed thru the web interface), files are many days old. I
don't know why.

Cheers,
Forrest

On Sun, Nov 1, 2009 at 9:21 AM, Ben Lau <xbenlau@xxxxxxxxx> wrote:

> 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
>
> _______________________________________________
> Mailing list: https://launchpad.net/~ubuntuone-users<https://launchpad.net/%7Eubuntuone-users>
> Post to     : ubuntuone-users@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~ubuntuone-users<https://launchpad.net/%7Eubuntuone-users>
> More help   : https://help.launchpad.net/ListHelp
>

References