How do I resolve *.conflict files?

Asked by Ryan Maki on 2009-07-23

Several weeks ago one of my files was renamed file.ext.conflict during a sync operation. How can I resolve this conflict?

User story:

I was working on a new Ruby script that I must have changed on two machines without syncing it. The file in question is always renamed back to file.ext.conflict, even after I've removed .conflict.

I'm editing this script quite a bit and it's annoying to have it constantly marked .conflict and not synced.

I am also forced to synchronize this file via sneakernet now that U1 is ignoring it.

Question information

Language:
English Edit question
Status:
Solved
For:
Ubuntu One Client Edit question
Assignee:
Lucio Torre Edit question
Solved by:
Lucio Torre
Solved:
2009-08-30
Last query:
2009-08-30
Last reply:
2009-08-28
Whiteboard:
Lucio, can you or one of your guys answer the question about resolving conflicts? Thanks! Josh

This question was reopened

John Lenton (chipaca) said : #1

On Thu, Jul 23, 2009 at 07:12:55PM -0000, Ryan Maki wrote:
> New question #77902 on Ubuntu One Client:
> https://answers.edge.launchpad.net/ubuntuone-client/+question/77902
>
> Several weeks ago one of my files was renamed file.ext.conflict during a sync operation. How can I resolve this conflict?
>
> User story:
>
> I was working on a new Ruby script that I must have changed on two machines without syncing it. The file in question is always renamed back to file.ext.conflict, even after I've removed .conflict.
>
> I'm editing this script quite a bit and it's annoying to have it constantly marked .conflict and not synced.
>
> I am also forced to synchronize this file via sneakernet now that U1 is ignoring it.
>

that was due to a bug in the syncdaemon, which has since been
fixed. Could you try downloading the newest release, to see if it
fixes the issue for you?

Thanks,

Ryan Maki (ryan.maki) said : #2

Thanks John Lenton, that solved my question.

Ryan Maki (ryan.maki) said : #3

I would like to re-open this line of questioning:

Now that the files are named *.u1conflict I have an "original" file _and_ a conflict file.
However, sometimes I only have the u1conflict file... why? What can I do with just a conflict file?

Also, the "original" file can be newer than the corresponding *.u1conflict file. (Aug 8 vs Aug 2)
How often is the conflict file updated?

How does U1 resolve these conflicts?
If the original is outdated, do I delete it and then rename the u1conflict file to the original file name?
If the conflict file is outdated do I just delete it?

Best Lucio Torre (lucio.torre) said : #4

The way to resolve conflicts is to pick from the original file (if there is one) and the conflict file the version that you wish to keep and to delete the conflict file or move the conflict file over the original one, depending on tour 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.

Ryan Maki (ryan.maki) said : #5

Thanks Lucio Torre, that solved my question.