Re: Git Scrambled Branches
Reply #5 –
hmm... no idea...
This is odd.
Well, unless you committed something to master you can just:
git checkout development
git branch -D master
git fetch elkarte (or the name of the remote)
git checkout elkarte/master
git checkout -b master
git push -f origin master
in other words drop and re-fetch master and force-push it.
And not to forget:
- master now holds the current "stable" version (at that moment 1.0.1),
- development holds the current development branch for the "next" version (at that moment 1.1 line),
- patch_1-0-2 is the one where the next micro is being worked on.