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..
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. :)
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot