Git Scrambled Branches
I just attempted to pull from the Elkarte repo to update my fork, but it appears the branches have been scrambled. Git has gone ahead and pulled from Elk's "development" branch into my "master" branch. What's going on?
Re: Git Scrambled Branches
Reply #1 –
What git client are you using? (To understand what it is doing.)
The only thing changed in the last period (several weeks ago, while working on 1.0.1 release) is that the development branch has been made the "default" at github. That should only mean that development is the branch shown on the home page instead of master, but that shouldn't affect already existing repository... unless some git clients is not using the default github branch to know what to pull, but the "default branch" at github (that would be "slightly" wrong TBH)., and that's the reason of my question about your client.
Re: Git Scrambled Branches
Reply #2 –
I'm using Git 1.7.9.5 from the Debian repo.