How do I update the master branch after merging it into another branch?

Question

I've finished a bunch of work in my feature branch. I merged the latest changes from master in (via vv merge -b master); the tests passed; all's committed. So feature now contains the latest/greatest code, and I'd like that revision to become the new master head.

I tried to merge back (vv merge -b feature from the master working folder), but vv complained that one revision was an ancestor of the other.

Accepted Answer

You're on the right track. You're in a situation something like:

branch: feature
head: 552:...
parents: 551, 545

branch: master
head: 545
parents: ...

and you're aiming for:

branch: master
head: 552

And you're right, vv won't let you merge between ancestors. In this case, vv branch is your tool of choice. Specifically:

vv branch move-head master --rev 552

will do the trick. To fully clean up, you'll want to

vv branch close feature

if you don't plan on working in that branch any more.

And you'll certainly want to visit the master working folder and

vv update

How do I update the master branch after merging it into another branch?

Follow this question

Related questions