Take the 2-minute tour ×
Ask Ubuntu is a question and answer site for Ubuntu users and developers. It's 100% free, no registration required.

So I've got a folder with a programme I'm working on. I'm using bzr to keep revisions of it... and whenever I commit to bzr it seems to create conflicts... ooor

I'm editing the files in Matlab (ok it's not a real programme but whatever) and i'm not sure if this causes the problem.... Any suggestions?

share|improve this question
1  
could you be more specific about your problem? what exactly are the conflicts? –  steabert Mar 28 '11 at 7:20
    
Can you post he exact errors you are getting? –  Manish Sinha Mar 28 '11 at 8:41
1  
Kindly post the exact error messages you get when you run bzr commit. –  Bilal Akhtar Mar 28 '11 at 10:58

1 Answer 1

I do not use Bzr but Mercurial and Git.

And as far as i know using both a sync service and a revision tool on the same folder may create problems especially if that folder is updated by on several computers running Ubuntu One (or any other file syncing service afaik).

I've been having a few issues with ubuntu one and mercurial and i think it has to do with the fact ubuntuone and the mercurial repository might not be in sync depending on the sequences of changes and commits. For instance I might update files on one computer and not commit them or get updated file from ubuntuone before or after i pull changes.

I think a second reference point (the bzr/mercurial/git) repository is enough to confuse ubuntuone.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.