Missed Team ’24? Catch up on announcements here.

×
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

conflict error while merging the code

Akshesh Panchal
Akshesh Panchal April 28, 2014

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 :(

Answer
Watch
Like Be the first to like this
306 views

3 answers

0 votes
Seth
Seth
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
April 28, 2014

https://answers.atlassian.com/questions/148518/resolving-conflicts-on-a-pull-request

Reply
0 votes
Seth
Seth
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
April 28, 2014

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

Reply
0 votes
Akshesh Panchal
Akshesh Panchal April 28, 2014

@Seth Foss

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

Reply

Suggest an answer

Log in or Sign up to answer
Product apps
Apps & Integrations
TAGS
AUG Leaders

Atlassian Community Events

    See all events