Managing Remote Branches Using Git

Posted by & filed under Web Development.

How to track and merge in changes from remote branches in Git from both the origin project repository (if applicable), as well as from other projects you have access to. The latter can be used as an alternative to “git push”

Git “not uptodate. Cannot merge.” Errors

Posted by & filed under Web Development.

These errors when going a “git pull” can be very confusing. They indicate that there are local changes that would otherwise be obliterated, and you are prevented from continuing unless you commit your changes, move or delete the file before doing a pull, or the workaround provided on this page…

Convert Fonts to TTF and EOT Formats For CSS Font Embedding

Posted by & filed under Web Development.

Since Firefox 3.5 and some version of Safari/Webkit released around 2007, both Firefox and Safari have supported embedding your own fonts into webpages for quite some time. This article explains how to embed fonts, as well as how to convert fonts of various formats to the TTF and EOT formats used for font embedding.

Making CSS RGBA Work in All Browsers

Posted by & filed under Web Development.

This article details how to make CSS RGBA properties work in IE browsers. Additionally, we have found that opacity settings have some weird characteristics involving inheritance of child elements. In short, setting opacity to 1 does not undo an opacity setting set by a parent element. This article also covers using RGBA to counter this scenario.

phpMyAdmin and Individual User Configs

Posted by & filed under Web Development.

phpMyAdmin natively supports a global set of configuration options for all users, but with a simple hack you can change this allowing particular users the options that are most useful to them, such as default tab view, max rows per page, etc. This article details this technique.