pull request conflict

[Sipan Margaryan]

I have three branches  "master" , "staging"  and also "test" branch. "test" branch is created from master and once merged to staging  after that I have done some changes on "test" branch now when I am trying to create pull request to staging I'm getting conflict on the row where I made changes on my first merge request.

[Ana Retamal]

Hi Sipan, not sure what's the question here. Have you tried already resolving the conflict? If not, you can do so following the tips at Resolve merge conflicts.

Hope that helps!

Ana