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.
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot