Using Beyond Compare as a Git Mergetool

At the October #altnetseattle meeting, we talked about git and Aaron Jensen mentioned a nice merge tool called p4merge, which I hadn't heard of before. I hadn't been able to get a merge tool to work right with msysgit before, so knowing Aaron was using p4merge with git led me to try again.

I actually still prefer beyond compare to p4merge - p4merge is nice and looks snazzy, but BC has all the right keystrokes and shows me just the right information when I am trying to do a merge.

To get it to work with git, I added this to my global git config ("C:\Program Files\git\etc\config"):

[merge]
    tool = bc3 # This will be the default merge tool invoked by git mergetool.
[mergetool "bc3"]
    cmd = C:/Users/cbilson/Desktop/BC3/bcomp.com \
        "$PWD/$LOCAL" \
        "$PWD/$REMOTE" \
        "$PWD/$BASE" \
  "$PWD/$MERGED" 
    keepBackup = false
    trustExitCode = false

I had trouble getting it to run from "C:/Program Files/..." or even "C:/Program\ Files/..." so I did a portable install of BC and run it from there.

F# + Monorail

Inspired by Matthew Podwysocki's post on using F# to build an ASP.NET MVC application, I built a Monorail application with F#.

I think this is a good exercise for F#-pies (pronounced: "F" "sharpies") because it kind of forces you to figure out how F# works with the rest of .NET instead of fixating on the functional aspects.

I believe the basics were all done by this commit. I am adding some more stuff to it (a domain model, something besides "Hello World") for a kind of larger attempt at building a real application all in F#.

New Blog

Actually, I've had this blog for a while, just never posted. I don't actually blog very much, and now kind of prefer just using twitter, so the value of my old blog was less than the $200/year I was paying. Still, it's nice to have a place to post things longer than 140 characters. That's what this is.