Git Architecture Question

Hi all,

I am new to Git and learning this powerful tool these days.

I have a simple question :-

I work on a project that has 3 different environments. dev, staging and production. dev is obviously the local git repo that all dev's work on. staging is where most of the development takes places on a daily basis. and production is where least development happens but we still do it because sometimes we have to fix things quickly directly on the production server.

So how should I set this up ?

2 branches staging and master (default) ?

How can I make it so that the staging branch gets deployed to a different folder on the server and the master branch gets deployed on a different folder ?

Once a week, we would merge all the staging work into production and make a release.

Any ideas ?

Anuj Gakhar www.anujgakhar.com www.anshconsulting.co.uk