← Back to team overview

ubuntu-manual team mailing list archive

Re: Ubuntu Desktop - Conflicts


On 06/02/2012 09:15 PM, Mario H. Burgos wrote:

I'm getting the following after pulling the latest revision

    bzr status:

Also - who all is working on this chapter.
I'd agreed to do the ODT to LaTex changes (though that is going slowly).


Mario Burgos

Mailing list: https://launchpad.net/~ubuntu-manual
Post to     : ubuntu-manual@xxxxxxxxxxxxxxxxxxx
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help   : https://help.launchpad.net/ListHelp
I've just pulled the latest revision and the changes applied without a conflict, so i guess the problem is on your local branch. If you haven't made any changes that you want to push, you can delete the local branch and then download the branch (bzr branch ..). If you have made changes to some files, you can keep back up of them and then after redoing what i said before you can see what the differences are and then push the changes to the branch or you can solve conflicts on your existing local branch and then push. I got the same problem in the previous release and the above process saved me a lot of time.