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

0 vote

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

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published Thursday in Agile

How Davin Studer gets Confluence to do everything he wants it to do...except dishes

  @Davin Studer holds many interests, including but not limited to health tech and Star Trek. Read on to discover more about Davin, from his favorite Confluence macros to his favorite lit...

201 views 1 9
Read article

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