<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Ok. Thanks for fixing it. But I STILL cannot get past testCols.d.
git won't let me do ANYTHING because it regards testCols.d as "the
same only different" because of those goddamed CRLF's in it.<br>
<br>
<div class="moz-cite-prefix">On 2/21/2014 2:01 AM, Daniel Murphy
wrote:<br>
</div>
<blockquote
cite="mid:CAMU72LF75f6zTYbdYdLDQ4Xm=azVPF_HOH2X=6NwmuUF_XeLKw@mail.gmail.com"
type="cite">
<div dir="ltr">
<div>On Fri, Feb 21, 2014 at 8:51 PM, Walter Bright <span
dir="ltr"><<a moz-do-not-send="true"
href="mailto:walter@digitalmars.com" target="_blank">walter@digitalmars.com</a>></span>
wrote:<br>
</div>
<div>
<div class="gmail_extra">
<div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">But
I had just pulled the latest master and did a refresh on
github to ensure there had been no new changes before I
pushed. I'm still a bit baffled why that didn't work.<br>
<br>
</blockquote>
<div><br>
</div>
<div>When you did git reset --soft HEAD^ it picked the
testCols commit, because you had merged master into that
branch rather than the other way around.<br>
</div>
<div><br>
</div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
So, what's the correct procedure to undo the last commit
to master?
<div class="im"><br>
</div>
</blockquote>
<div><br>
</div>
<div>The way I usually do it is to look at the history
(git log, gitk, or the internals list) to get the hash
of the last correct merge commit, then `git reset
--hard` to that.<br>
</div>
<div><br>
</div>
<div>But this can seriously screw things up if done wrong,
so if you're not 110% sure it's best to just let
somebody else fix it.</div>
<div> <br>
</div>
</div>
</div>
</div>
</div>
</blockquote>
<br>
</body>
</html>