Increasing file upload size limit in nginx

A common problem while running nginx as a frond end to php based Apache+mod_fastcgi server is the size that nginx allows you to upload. Sometimes the app allows user upload images up to 2MB in size. Other times when users try to upload 1.5MB or larger in size while...

How to Resolve Git Conflict

For those of you who use some form of version control, merge conflicts are familiar. Git is exceptional at auto-merging conflicts. However, there are some cases in which Git is unable to determine what needs to be done automatically. In that situation a manual merge...