<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
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.<br>
<br>
Cheers,<br>
Daniel<br>
<br>
<div class="moz-cite-prefix">On 29/01/16 02:59, Cody Herzog wrote:<br>
</div>
<blockquote
cite="mid:CADtL+eNffCCEbMK0vLHHaFFsr5c-GOzVxS5EP05tjADSPkMMXA@mail.gmail.com"
type="cite">
<div dir="ltr">
<div>
<div>
<div>Good news!<br>
<br>
</div>
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:<br>
<br>
git reset --hard origin/master<br>
<br>
</div>
I had no other local changes, so that worked well.<br>
<br>
</div>
<div>I'll have to be more careful with GitHub for Windows, or
just do everything form the command line from now on.<br>
</div>
<div><br>
</div>
Thanks.<br>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Thu, Jan 28, 2016 at 3:36 PM, Cody
Herzog <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:codyherzog@gmail.com" target="_blank">codyherzog@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">
<div>
<div>
<div>
<div>
<div>
<div>Hello.<br>
<br>
</div>
I feel like a total idiot.<br>
<br>
</div>
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.<br>
<br>
</div>
The branch I was inspecting was
'lazedo/presence_improvements'.<br>
<br>
</div>
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.<br>
<br>
</div>
Anyway, before trying to do anything more, I figured I'd
asked for advice, because I don't want to screw up
further.<br>
<br>
</div>
<div>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.<br>
</div>
<div><br>
</div>
Thanks.<br>
</div>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list
<a class="moz-txt-link-abbreviated" href="mailto:sr-users@lists.sip-router.org">sr-users@lists.sip-router.org</a>
<a class="moz-txt-link-freetext" href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Daniel-Constantin Mierla
<a class="moz-txt-link-freetext" href="http://twitter.com/#!/miconda">http://twitter.com/#!/miconda</a> - <a class="moz-txt-link-freetext" href="http://www.linkedin.com/in/miconda">http://www.linkedin.com/in/miconda</a>
Book: SIP Routing With Kamailio - <a class="moz-txt-link-freetext" href="http://www.asipto.com">http://www.asipto.com</a>
<a class="moz-txt-link-freetext" href="http://miconda.eu">http://miconda.eu</a></pre>
</body>
</html>