Merge from Trunk to Branch question

Suppose I have a file in the trunk (file1.c) and it is modified multiple times. i.e. It's version number will increase.

The same file in the branch does not get modified.

When I do a merge from trunk to branch what happens? My understanding is that file1.c in the branch will be modified to be the same as file1.c in the trunk and then I'll have to commit these changes to file1.c into the branch. Is this correct?

Thanks,
Clement

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1115734

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-07 02:36:38 CET