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.
On 2/21/2014 2:01 AM, Daniel Murphy wrote:
On Fri, Feb 21, 2014 at 8:51 PM, Walter Bright <[email protected]
<mailto:[email protected]>> wrote:
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.
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.
So, what's the correct procedure to undo the last commit to master?
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.
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.
_______________________________________________
dmd-internals mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/dmd-internals
