Discussion
UMC
IN
Last activity: 25 Feb 2020 13:48 EST
Rule resolution process while using branches
What is the rule resolution technique when branches is used. Is there any difference than general ruleset version based development.
So basically when same rule exists in 2 branches there will be conflict. so the rule has to be merged in any one branch, so that the other branch can use for further updates. Is my understanding correct?
Updated: 25 Feb 2020 13:48 EST
Areteans
AU
almost there!
When using branches, Rule resolution will always pick te rule present in the higher branch as specified in your application.
Now for the conflicts, it is not necessary to merge so that other branch user can do further updates, Both can do the updates to the same rule in their respective branch, while testing they just need to move their branch above other branches so that his rule will be picked by rule resolution.
RuleA is present in 2 branches, Suppose user A has finished his update on Rule A, and tested as well, parallelly User B is making some updates to the same rule(Rule A) in another branch. As User A has finished his updates, he will merge his branch in ruleset, User B when he completes his update then he needs to check the updates made by userA and do those updates in his branch -> this is called retrofit (resolving the conflict).