-
Recent Posts
Recent Comments
- Raif on Tips for building Nuget packages
- joshuaflanagan on Coordinating multiple ajax requests with jquery.when
- Kalina Todorova on Coordinating multiple ajax requests with jquery.when
- joshuaflanagan on How we handle application configuration
- Richard Brown on How we handle application configuration
Archives
- March 2012
- February 2012
- January 2012
- October 2011
- August 2011
- June 2011
- May 2011
- February 2011
- January 2011
- November 2010
- October 2010
- September 2010
- July 2010
- June 2010
- May 2010
- April 2010
- March 2010
- February 2010
- January 2010
- December 2009
- August 2009
- July 2009
- June 2009
- May 2009
- April 2009
- March 2009
- February 2009
- January 2009
- September 2008
Categories
Meta
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
4 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