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.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Meet @Dinesh Dhinakaran, @Vishnu Vasudeva, @Rajeev Verma, and Jamshid Nalakath: Our extraordinary AUG leaders from Bengaluru, India. These four work together to strengthen the bonds of their local co...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs