CVS to merge from trunk to branch multiple times - quick question

2 views
Skip to first unread message

Zk W

unread,
Apr 29, 2014, 8:17:44 PM4/29/14
to
Hi All

We're new to CVS and we need to merge trunk changes to a branch from time to time.
We are not sure how the -j option is used for the 1st merge from trunk to branch.

We are also unsure how the multiple -j options are used for subsequent merges from trunk to the same branch.

What's the syntax to merge back from a long lived branch to the trunk?

Could someone share an example including use of tags to do a proper merge from
a) trunk to branch
b) trunk to branch again
c) branch to trunk (assuming code completion)

Thank you
Sincerely
Reply all
Reply to author
Forward
0 new messages