[mapserver-dev] 6.4 stable branch gone wild

Even Rouault even.rouault at mines-paris.org
Tue Dec 3 04:11:08 PST 2013

Selon thomas bonfort <thomas.bonfort at gmail.com>:

> I've pushed the changes to the github repository... for anyone that
> has pulled branch-6-4 since november 20th, the easiest is to delete
> your working branch-6-4 and start it back from scratch:
> #move off off the current branch-6-4
> git checkout master
> #delete current branch-6-4
> git branch -d branch-6-4
> #update our remote
> git fetch origin #supposing origin is mapserver/mapserver
> #checkout the updated 6-4 branch
> git checkout --track origin/branch-6-4
> catch me on irc if you need help

Hi Thomas,

Would you mind explaining the procedure you followed to recreate the branch with
the appropriate commits in it (hoping that you didn't need to write down each
commit sha1 and cherry-pick it...) ? I imagine it could be helpful in case this
happens to someone else.



More information about the mapserver-dev mailing list