Re: [SR-Users] Possible accidental merge to master.

2016-02-03 Thread Daniel-Constantin Mierla
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.

[SR-Users] Possible accidental merge to master.

2016-01-29 Thread Cody Herzog
Hello. I feel like a total idiot. I was inspecting the various GitHub branches for Kamailio using a GitHub visual client, and I think I managed to accidentally merge a branch back into master. The branch I was inspecting was 'lazedo/presence_improvements'. I was inspecting diffs and branches, a

Re: [SR-Users] Possible accidental merge to master.

2016-01-29 Thread Cody Herzog
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