Simple branching question

If you are having a problem using Vault, post a message here.

Moderator: SourceGear

Post Reply
ssinger
Posts: 9
Joined: Mon Mar 01, 2004 8:54 am

Simple branching question

Post by ssinger » Thu Mar 04, 2004 1:19 pm

Hello. I have a question regarding branching and Vault 1.2.1. Will changed files on the trunk appear in my branch? For example, I branched am asp.net web project. I didn't checkout any pages yet. Someone else checks in a few changes to the trunk. If I look in Vault at my branch, will I see the changes from the trunk?

Obviously, I'm new to branching and just getting my feet wet!

Thank you,

Steve
ssinger@trendmls.com

dan
Posts: 2448
Joined: Wed Dec 17, 2003 5:03 pm
Location: SourceGear
Contact:

Post by dan » Thu Mar 04, 2004 9:20 pm

Once you branch, files changed in one place are not automatically updated in the other. You can invoke MergeBranches to migrate the changes from one branch to another.

In 1.2, you can only migrate changes from a branch back into the trunk from where it was created. In 2.0, you can migrate changes from any source tree to any other tree (allowing merge from branch to trunk, or from trunk to branch).

Post Reply