My Local Repo get dependecy with remote..

Viktor Iwan December 21, 2013

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

0 votes
cofarrell
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.
December 25, 2013

Hi Viktor,

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

http://stackoverflow.com/questions/10197188/git-flow-branches-have-diverged

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. :)

Cheers,

Charles

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events