No matter how much you mess your local clone of the git repository, you
can just remove the folder on your hdd and then clone again for kamailio
github repository, check-out the desired branch and you are back in
original state. In other words, your local changes don't affect the
remote repository.
Good news!
Turns out that I had not actually pushed my accidental merge, and I believe
I was able to revert it successfully with the following command:
git reset --hard origin/master
I had no other local changes, so that worked well.
I'll have to be more careful with GitHub for Windows, or just