Forum Discussion

esoysal's avatar
esoysal
Occasional Contributor
15 days ago

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 of conflicts. Is there a side-by-side view option in ReadyAPI, so I can see the differences resolve all the conflicts? If not, what are the alternative ways to resolve these conflicts? 

1 Reply

  • CarlosValcarcel's avatar
    CarlosValcarcel
    Icon for Staff rankStaff
    6 hours ago

    Sadly, 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!