Trusty branch/series now online

[Tom Davies]

Hi :)
if you just copy the changes you have made over the top of whatever the
other person did then all their changes are lost.

I tend to just tend to
1.  pick whichever of the conflicting paragraphs i prefer or
2.  just pick one at random and fix it myself

Regards from
Tom :)


On 31 October 2013 07:55, Hannie Dumoleyn <lafeber-dumoleyn2 at zonnet.nl>wrote:

> op 30-10-13 15:22, Little Girl schreef:
> > Hey there,
> >
> > Hannie Dumoleyn wrote:
> >
> >> Hi Liz,
> >> Thanks for these step-by-step instructions. Very convenient. I would
> >> like to add one thing. After having downloaded the branch to your
> >> pc, it might be advisable to regularly update it with the command
> >> bzr pull. Hannie
> > I agree. This one is really important when there are many people
> > editing files, so that everyone has a current copy.
> >
> > It also might be a good idea to add instructions for conflict
> > resolution. This (outdated!) wiki page I wrote a while back has a
> > conflict resolution section that still applies, and you're welcome to
> > copy it for the Ubuntu page:
> >
> >
> https://wiki.kubuntu.org/Kubuntu/SystemDocumentation#Bazaar_conflict_resolution
> >
> Hi Little girl,
> I do like the idea of adding instructions for conflict resolution. Based
> on my experience, what I usually do when there is a conflict is the
> following:
> 1. Make a copy of the file I have changed
> 2. Remove the old branch and get the latest branch from Launchpad
> 3. Copy the changed file back to the new branch and then commit and push.
> Another useful command is bzr status which I often use before committing.
> Greets,
> Hannie
>
> --
> ubuntu-doc mailing list
> ubuntu-doc at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20131031/2340414e/attachment.html>