Re: v2.1.x branch renamed to v2.x.x

Arran Cudbard-Bell wrote:

Yeah something extremely weird happened when I tried to merge some guys changes back in. I've now corrected it.

Uh... "git reset --hard HEAD^^^^", followed by "git pull", followed by another attempt at merging.

You might have to dig out the last few commits and git pull to get back to the correct HEAD ref.

I see a number of commits I made were re-done. I'd like to avoid these kinds of issues. Alan DeKok.