How to resolve conflict in pull request

Avinash Jeshta

Suppose I have two branches, develop and release_v1, and I want to merge the release_v1 branch into develop.

I do a pull request to merge release_v1 to develop, but, after the pull request has been done, I discover that there is a conflict 

How can I solve the conflict?  which are the steps to perform?

Thanks in advance.

Alexey Matveev

Hello,

You should resolve conflicts using git commands. For example, you can see how to do it in this article:

https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/