How to organize git workflow?

Finally decided to start using a version control system. The choice fell on git (on bitbucket).
There is a project (a web portal) is stored on the hosting (absolutely working version). There are 3 people who can modify the code, adding new modules and features. All these changes are on test subdomains (each has his own, which is updated periodically), at the end of the development the modified code is transferred to a working website.
As theoretically, to organize the work for the change of the working draft were preserved in history, and how to upgrade to test versions of each of the developers?
September 26th 19 at 06:15
4 answers
September 26th 19 at 06:17
Solution
was toaster here
September 26th 19 at 06:19
To do the features in separate branches, which then merit in master.
September 26th 19 at 06:21
Look at gitflow. There are turnips, articles on habré time, two and a gitflow plugin for IDEA
September 26th 19 at 06:23
And here's another great article about rebase: habrahabr.ru/post/161009

Find more questions by tags BitbucketGit