[Bzr-windows] problem merging / rebasing with local sandbox - my workflow? (lp: message 1 of 20)

[Martin Pool]

On 14 July 2011 08:20,  <lp.20.dto1 at spamgourmet.com> wrote:
> One more question on this, sorry for not asking it earlier.
>
> I was of the understanding (probably incorrect) from reading the page
> referenced below that given:
>
> local trunk as a branch of something remote
> featureX & featureY as branches of the local trunk
>
> that changes to either of the feature branches should push to the remote
> url.
>
> But, when running through this and using your suggestion, it seems to work
> better if I instead:
>
> make & commit the changes to the feature branch
> switch to and update my local trunk
> pull or merge the changes from my feature into local trunk
> push my local trunk to the remote url
>
> Doing this seems to prevent me from having any kind of out of sync
> conflicts, even if X is way in front of Y, but I guess seemed backwards from
> what I was thinking the guide was recommending.
>
> I just want to make sure I'm going about it correctly, any thoughts? If you
> know of a post somewhere that explains this, I'd gladly welcome that.

Either of those can work.  If you do the latter, then your changes
will always be seen as being merged into trunk, rather than trunk
being replaced by the contents of the new branch.

Can you point me to the part of the documentation that's unclear and
we can see about improving it.

m