As posted earlier, I've moved git branches around so main development is on master branch. Here are your options to change your local environment
Option 1. All new git clone git clone [email protected]:dhubler/sipxecs.git Option 2. branch shuffle - This option is useful if you have any commits you haven't pushed yet, or you don't want to consume the bandwidth getting a new clone. Don't be scared, this isn't too bad and very quick. ** Please read carefully, you may not have to do all these steps 1.) check if you have a local "master" branch. If you do not, skip to step #4 git branch master <-------------- you have a local "master" branch * master-4.2 2.) delete local master branch. if this succeed, skip to step #4 git branch -d master 3.) if step #3 fails because of local changes, be sure there aren't any you want to keep, then force delete with... git branch -D master 4.) get remote changes including branch renames. git fetch origin 5.) create local tracking branch and check it out git branch --track master origin/master git checkout master 6.) then if there are commits on your old branch (or any branch) you want move over git merge master-4.2 Additional Notes =============== * The old master branch moved to "unrelease-4.2.1" * I decided not to delete "master-4.2" at this time in case that caused grief for some. Please do not push back to this branch. If you do, your changes will not be used in any release. It's up to you to move your changes over to "master". I will delete the branch as soon as I discover it's existence is more trouble than it's worth. _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev/
