Recently I ran into a problem. I had two git repositories for the same project. Both git repositories were diverged and had individual work and git trees. Quick and dirty way to get things from git B to git A and do a giant squashed commit to get it back [...]
Fix? Mac OS X Lion, .local domain hell
Ran across this blog entry that showed a “fix” for OS X Lion and how it will consider Multicast DNS first before /etc/hosts lookup. At my employer we use .local domain within our corporate environment and this causes all sorts of pain with Capistrano deployments, development environments, etc. All .local [...]
