Gah - lost the whole afternoon's work because I didn't realize a git pull was in conflict and I continued coding.