My Local Repo get dependecy with remote..

Ok here's my scenario:

I'm working on my local repo, using sourceTree, want to create a hotfix branch (with gitflow), while suddenly it fails with error output:

"Branches 'master' and 'origin/master' have diverged.

Branches need merging first.

Completed with errors, see above."

Any idea why my repo require me to workalong with remote ? seem doesn't like dvcs characteristic..

1 answer

Hi Viktor,

I'm not really that familiar with Git Flow. Does this SO page answer your question?

Honestly, unless the question is related to Stash you're better off asking general git/gitflow questions at SO as you're going to get 1000 more answers. We're always happy to help but there are less of us here. :)



Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

635 views 0 4
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot