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 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.


1 answer

0 vote

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

Suggest an answer

Log in or Join to answer
Community showcase
Alexey Matveev
Published Saturday in Jira

How to run Jira in a docker container

Everything below is tested on Ubuntu 17.10. I prefer to use Jira in a docker container because: 1. I can install Jira with a couple of commands. 2. I can start and stop Jira just by starting and s...

155 views 3 7
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot