Merge code between branches
Hello,
I am looking of any kind of help on branching and merging rulesets. Below is the scenario for the same.
1 : 2 Development teams(Dev1Team,Dev2Team) have branched the rules from base version .
2 : Dev2Team merged back the code to base version (1.0.0) after development and further after testing moved to production.
3 : Dev1Team had few issues and couldn't go for QA and there was a new base version has been released(2.0.0).
4 : 2 branches has been created from base version(2.0.0) for both the team.
5: Now Dev1Team want to merge the code from previous released branch to new branch .
Can we merge code b.w. branches? Is it right way to do it?
I am looking for experts help to answer my question.
Posted: 5 years ago
Hi,
If I understand your question correctly, it sounds like you are trying to move rules from one branch to another branch. Designer Studio allows you to move rules between branches using the "Save As" > "Specialize by class or ruleset" button on the ruleform header. Unfortunately, there is no way to do this in bulk. The other downside is that Designer Studio does not perform conflict detection when moving rules between branches - it's not a true "merge". By the way, Pega 7.1.8 contains a number improvements to the Merge wizard - including the ability to merge multiple branches back to their base ruleset at once.