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

Pull request shows conflict when there is none.

fuck atlassian
fuck atlassian
Contributor
September 21, 2015

Ok so i manually solved ALL conflicts and the file list shows that there are no conflicts.

as you can see here http://prntscr.com/8j3j14

but the button merge shows there is a conflict, but in reality there is none. There just isnt, everything should just work, but doesnt.

Answer
Watch
Like Be the first to like this
462 views

1 answer

0 votes
rrudnicki
rrudnicki
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
September 22, 2015

Hi Alex, 

I believe this will requires a further investigation and gathering more information as well.  Do you mind to raise a ticket to us so we can investigate this issue?

 

Regards

Renato Rudnicki 

Reply

Suggest an answer

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

Atlassian Community Events

    See all events