My Local Repo get dependecy with remote..

Question

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

cofarrell · Answer

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