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
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Get started Tell me more
Atlassian Community about banner
4,456,703
Community Members
 
Community Events
176
Community Groups

merge conflict in master branch

Gayatri Gangele
Gayatri Gangele Dec 23, 2019

need help to get the solution of merge conflict in repository

 

Comment
Watch
Like Minh Tran likes this
534 views

2 comments

Ganesh Babu
Ganesh Babu Community Leader Dec 23, 2019

Hello,

Merge Conflict occurs when the same lines are being edited both in the source and destination file. This merge conflict can be resolved by keeping the required lines from source or destination.

Clone the repository and fix the merge conflict

Like
Gayatri Gangele
Gayatri Gangele Dec 23, 2019

 cloned the repository to my master branch but it again showing merge conflict error in my other branch ,its showing that "automatic merge failed;fix conflict and then commit the result"

Like
Ganesh Babu
Ganesh Babu Community Leader Dec 23, 2019

Ok, Try following this documentation this might help you to resolve the issue you are facing.

And for me to look please share the screenshot.

https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

Like
Gayatri Gangele
Gayatri Gangele Dec 27, 2019 • edited

Thank you ,Its helpfull

Like
Reply
Gayatri Gangele
Gayatri Gangele Dec 23, 2019

I cloned the repository to my master branch but it again showing merge conflict error in my other branch ,its showing that "automatic merge failed;fix conflict and then commit the result"

Like
Reply

Comment

Log in or Sign up to comment
Bitbucket
Bitbucket
TAGS

Atlassian Community Events

See all events