Selective merge (resolve conflicts)
over 3 years ago by Shawn Jaques
09-01-2020
Branching enables you to keep your tests aligned with your code. When you branch your application code, create a new test branch to update or add new tests as your application code changes. Then merge the tests back into your main branch to have updated tests ready to check the new features.
Merging branches just got a lot easier and more detailed. When merging two branches, you can select the entire test or specific steps to merge into the target branch. Resolving conflicts is easy and visual, displaying each conflict allowing you to choose the correct step to merge.
After the merge, the source branch will still exist until you delete it.
Read more in the docs.