Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

How to resolve conflict in pull request

Avinash Jeshta
Avinash Jeshta November 16, 2018

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.

Answer
Watch
Like Be the first to like this
413 views

1 answer

0 votes
Alexey Matveev
Alexey Matveev
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
November 16, 2018

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/

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events