When you merge a branch, any tests or flows that have picked up newer versions on master are now saved as new master versions labeled with the merge.
Previously, merging would silently roll a master version backward for those specific tests and flows. For example, if a branched test was saved at version 37 while master progressed to version 38, merging the branch would reset master back to version 37, leaving version 38 stranded in the version history with no clear explanation. Now, that merged test becomes version 39. The master version it replaced remains as an earlier version in the history, and you can clearly trace test and flow edits and where they came from.
No action is required; these changes are already in effect wherever you merge branches.
How it works
The branch details page now flags every test and flow where master has moved past the branch point.
When you select Merge branch, the dialog lists each conflicting test and flow by name with the exact consequence, for example: "Master version 38 is newer than branch version 37. Merging saves the branch version as a new master version, replacing the newer master changes." You can resolve this in two ways:
- To reconcile the two versions by hand, click Resolve conflicts
- To merge the branch version as is, click Merge anyway