Re: [Bzr-windows] problem merging / rebasing with local sandbox - my workflow?

[Martin Pool]

> The problem happens when:
>
> I commit to X
> someone else committed to trunk (or I did over on Y & pushed)
> Try to push or pull X.
>
> An alternate is:
>
> I commit to X
> I push X
> I switch to Y
> I commit to Y
> I try to pull / merge / rebase Y so I can push
>
> I get the message that the branches have diverged and I should use `missing`
> to see them, or `merge` to resolve them. However, since these feature
> branches are branches under a shared repo with no checkout, I get error
> messages when I try to merge, pull or rebase.
>
> It may be a problem with my workflow, or maybe I'm missing something, I'm
> not sure.

There are two main possibilities, depending on whether you want to
rebase your changes so they look like they happened sequentially, or
whether you want to show them as concurrent branches that merged.

If you want to merge them:

  bzr switch trunk
  bzr pull
  bzr merge ../Y
  (resolve whatever)
  bzr ci -m "added feature Y"

Martin

_______________________________________________
Mailing list: https://launchpad.net/~bzr-windows
Post to     : bzr-windows@lists.launchpad.net
Unsubscribe : https://launchpad.net/~bzr-windows
More help   : https://help.launchpad.net/ListHelp