conflict error while merging the code

Hello folkes,

i've an issue regarding bitbucket when i am trying to merge the go i am facing this issue..

After "PULL REQUEST"

I got an issue src/main/webapp/css/main.css (conflicts) the code is fine in Eclipse but in Bitbucket view its showing 2 more lines added in code having some text. like

<<<<<<< destination:f27cd37fb7008c0d18f63514ca44ceacbaa3c658

and

>>>>>>> source:95de515e0203585db3c4f1084e37ade6dcc08ed2

and i am unable to merge the code...

Please help me :(

3 answers

This widget could not be displayed.

@Seth Foss

yeap its also"============" a part of my bad performance

This widget could not be displayed.

Are those lines the ONLY differences? At the very least, there should be a "=========" somewhere.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 22, 2018 in Marketplace Apps

How a Marketplace app tech team is achieving gender diversity

Hello! My name is Genevieve Blanch, and I'm the Marketing Manager at RefinedWiki, creators of apps to give teams the tools to customize Atlassian platforms. Currently, 44% of the tech team at Re...

491 views 3 18
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you