Agreed
Deploying new versions becomes even easier if you clone a branch to a new subdirectory and simlink that to the Moodle website location. That way, you never worry about git merge issues, and can quickly revert back to a previous version if things head south