Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

BitBucket Unable to merge Unrelated Branches

Hello all,

 

I am new to git and not super tech savvy when it comes to it. I use source tree to commit and push code. I am running into strange issues which I never did before. When I merge my branch to the master I get this errorGitIssue3.PNG: "Unable to merge, unrelated branches".

Moreover, I see strange things in my repo:

 

1. The remote and the locals don't seem connected at all GitIssue2.PNG 

2. I keep getting prompted for authentication but that username is wrong and I can't find a way to change it:

 

GitIssue1.PNG

Any help in this regard would be great!

 

 

1 answer

0 votes
Mike Corsaro Atlassian Team Feb 21, 2018

Hello! You're seeing this error because "Aditya_local" is branched from "master" which is somehow different than the master that exists online in Bitbucket. I'm not sure how that happened -- what steps did you take to create your repository?

I started programming locally. Then when things started to work, I first created an online repo on BB. Then using source tree, I created a new repo with the project folder of my local code. Then I added remote to it using the url from the BB repository. 

Like Ola B likes this

Mike Carsaro so if we have to merge these 2 unrelated builds then how should we do that?

Mike Carsaro pls remember the basic etiquette of replying back.

Like Dashkevich Pavel likes this

confronting from the same issue

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,886 views 0 7
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you