Do a merge from bzr+ssh://
bazaar.launchpad.net/~subs-qcontinuum/stellarium/gpslocator/<http://bazaar.launchpad.net/%7Esubs-qcontinuum/stellarium/gpslocator/>to
your local branch. IF you use the Bazaar GUI, this is just hitting
the
merge button. If there are any conflicts, the GUI will also show these, and
allow you to merge.
As an aside, I use kdiff3, as it can automatically merge almost anything; it
works much better than most merge tools. And it's free.
On Wed, May 11, 2011 at 11:23 AM, rusirius <[email protected]>wrote:
> I'm trying to push and updated version of my Gps Locator plugin to
> launchpad at location:
>
> bzr+ssh://bazaar.launchpad.net/~subs-qcontinuum/stellarium/gpslocator/<http://bazaar.launchpad.net/%7Esubs-qcontinuum/stellarium/gpslocator/>
>
>
> However, I am getting an error in Bazaar:
> bzr: ERROR: These branches have diverged. See "bzr help diverged-branches"
> for more information.
>
> I'm not sure what has happened since my last 'push' but I am uncertain as
> to whether I should follow the solution given by the bzr diverged-branches
> or not?
>
> "The solution is to merge the revisions from the mainline into your local
> branch... This merge may result in conflicts if the other developer's
> changes overlap with your changes. These conflicts should be resolved
> before continuing...."
>
> Can anyone advise me how to proceed?
>
> Thanks.
>
>
>
> ------------------------------------------------------------------------------
> Achieve unprecedented app performance and reliability
> What every C/C++ and Fortran developer should know.
> Learn how Intel has extended the reach of its next-generation tools
> to help boost performance applications - inlcuding clusters.
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Stellarium-pubdevel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
>
>
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Stellarium-pubdevel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
