merging two branches using cvs in unix

i have two branches where simultaneously development is going on.

i am trying to merge these two branches using following commands.

cvs -d :ext:anonymous.com/cvs/sandbox update -j nextBranch -j prevBranch moduleName

when i am executing the above command prevBranch code is getting merged into the current working of the nextBranch but whatever the changes done in the nextBranch are not getting merged.

my concern is to have both changes of prevBranch and nextBranch into the merged one.

 

please provide any suggestions.

Thanks

1 answer

This widget could not be displayed.

Could you explain what this has to do with atlassian applications?

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Thursday in United States

Local Atlassian Research Workshop opportunity on Sep. 28th

We're looking for participants for another workshop at Atlassian! We need Jira admins who have interesting custom workflows, issue views, or boards. Think you have a story to sh...

53 views 0 0
View post

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you