Re: Merging between trunk and branch

On Wed, Feb 11, 2009 at 06:11:28PM +0000, Graham Bull wrote:
> If I create a branch from a project's trunk, then can I merge revisions both
> from the trunk->branch and from the branch->trunk?

Yes.

> The purpose is for revisions to be committed on both the trunk and the
> branch, and they'll be merged to the other without either the trunk or
> branch ending so that development can continue on both.

This happens a lot and usually reveals an inefficiency in your branch
management. If changes need to be in both trunk and your branch, then
what is the purpose of your branch?

> Am I right in that --reintegrate signals the end of a branch, so I wouldn't
> use that here?
>

Yes.

tyler
Received on 2009-02-11 19:50:46 CET