Milo,
Do you mind updating your changes for the 2.0 branch? Then I can merge them in.
Thanks!
Thank you for the information David,I did as you said and it turned out I needed to checkout the 2.0 branch before I could run the second line. For others who share the same trouble:$ git branch -m master 1.2#check that there are no pending commits:$ git status#if you have pending commits in the 1.2 branch, commit and push them first# check out 2.0$git fetch origin 2.0:2.0#now you are ready to move 2.0 to master:$ git branch -m 2.0 master
Good luck!Kind regards,Milo van der Linden2010/11/3 David Kobia <david@...>
Hi Guys,
I just wanted to let you know that we've now converted (renamed) the 2.0 branch on github to master. To avoid breaking your local github repos, please do the following:
This will rename your local branches accordingly, so that your local master will match the remote branch which is the original 2.0 branch.$ git branch -m master 1.2$ git branch -m 2.0 master
Thanks!
David
--
Milo van der Linden
Open Source Geospatial consultant
dogodigi - Geospatial solutions
Beukenlaan 2
5261LE Vught
T. +31616598808