Monthly Archives: January 2010

How to resolve a binary file conflict with Git

When performing a merge in git, you might see the message: warning: Cannot merge binary files: HEAD:somefile.dll vs. otherbranch:somefile.dll Auto-merging somefile.dll CONFLICT (content): Merge conflict in somefile.dll Automatic merge failed; fix conflicts and then commit the result. In this scenario, … Continue reading 

Posted in git | 6 Comments

FubuMVC – Define your actions your way

In this post I’m going to try and demonstrate the flexibility that FubuMVC allows in how you build your web applications. While FubuMVC is opinionated about some things (lean on your container as much as possible), it mostly gets out … Continue reading 

Posted in fubumvc | 8 Comments