On Thu, Aug 8, 2013 at 11:46 AM, Terry Brown <[email protected]>wrote:
> You should have > pulled a fresh copy of the trunk in a separate directory (very fast if > all your branches are under the same shared repo. parent dir.). Then > merge your committed changes from your branch into the trunk, and push. > thanks again for this Terry! New revised recipe, using co-located branches: # switch to guaranteed non-messed with branch bzr switch v4.11-final # create new scratch branch from clean branch (and switch) bzr colo-branch catch-up-to-main # merge in my stuff which should have been in a branch, but wasn't bzr merge origin/trunk # push my changes to the real trunk bzr push lp:leo-editor # go back to local mainline, sync, and scrap temp branch bzr switch origin/trunk bzr pull lp:leo-editor bzr colo-prune catch-up-to-main Important note to self: in order to skip this dance in future, always create a new local branch before making changes! bzr colo-branch new-idea -matt -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
