Git merging and branching is always an issue, and without Git-flow things can get complicated. Here are some simple rules we go by at Wagento.
This posting is more for question answers than anything else.
The Basic Magento Web Server Install Guide
This install guide assumes that you already have the basic install of Centos 5.6 complete. We will now install Apache, MySQL and PHP 5.2.17