Daily Archives: June 2, 2009

git – committing in the midst of a conflicted pull

Just a note about an git-experience I had in case it helps someone else… I was doing a git pull and got a conflict (in the ChangeLog of all places). I fixed the conflict and then tried to commit the … Continue reading

Posted in computers | Comments Off on git – committing in the midst of a conflicted pull

missile gap, salt mine gap, education gap…

There’s always a gap. I think that this one, however, is real. The Future of Manufacturing, GM, and American Workers (Part II) | Robert Reich’s Blog “But we’re in danger of losing ground because too many of our kids, especially … Continue reading

Posted in lisp, politics | Comments Off on missile gap, salt mine gap, education gap…