How to resolve merge conflicts in ReadyAPI
I have develop, release, and master branches. I need to merge release branch into master as we completed the release. But when I created the pull request on Bitbucket, says it can't be merged because...
Forum Discussion
CarlosValcarcel
Staff
StaffSadly, the answer is No, there is no semantic-tyope merge tool.
When conflicts appear, you must treat your ReadyAPI project like any XML-based configuration project under version control: use Git/Bitbucket diffs, external merge tools, and a disciplined branching strategy.
Let me know if that helps!