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 do everything form the command line from now on.

Thanks.

On Thu, Jan 28, 2016 at 3:36 PM, Cody Herzog <codyherzog@gmail.com> wrote:

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, and was amazed that I was able to screw up so badly with one single click, but I guess that's the danger of a visual git client.

Anyway, before trying to do anything more, I figured I'd asked for advice, because I don't want to screw up further.

Hopefully there's a simple way to revert the accidental merge, but I first wanted to confirm that I actually did make that mistake, and that it's visible to others.

Thanks.

_______________________________________________
SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list
sr-users@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users

-- 
Daniel-Constantin Mierla
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Book: SIP Routing With Kamailio - http://www.asipto.com
http://miconda.eu