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/
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
