Forums
Home Product Q&A Discussion groups Articles Ask a question Search
Learning
Events
Champions

Forums

Articles
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: 
Product Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Pull request merge conflict

Dilpreet Badwal
Dilpreet Badwal
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
July 19, 2020

I do not get conflicts when I branch from master and merge my feature branch to it . But I get conflicts when I raise pull request to merge it to master branch . Can you please let me know how to resolve pull request conflict 

Answer
Watch
Like Be the first to like this
918 views

1 answer

1 accepted

0 votes
Answer accepted
Tyler T
Tyler T
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
July 20, 2020

Is your local master branch up-to-date (in sync) with Bitbucket?

Reply

Suggest an answer

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

Atlassian Community Events

    See all events
    Community
    Forums
    FAQs Forums guidelines
    Learning
    About learning Resources
    Events
    Champions
    Copyright © 2025 Atlassian
    Privacy Policy Notice at Collection Terms Security