[Git]How to properly organize the PHP application development process?

Question

git

There are two servers, a repository on bitbucket, and a local server.
What you need:
1. I’m developing on local
2. There will be two branches Master and Test
2. When there is something to test, push to the repository on bitbucket in the test branch
3. The test branch is merged to the test server
4. We test, we look, everything works fine, we merge everything into master branch
5. Master branch is merged into the main server
correct approach?
And now how to organize all this? How to do automatic deployment?

Answer 1

habrahabr.ru/post/106912

Answer 2

gitflow+bitbacket+codeship