Settings up git workflow
I am involved in project with three more developers and currently setting up the git repository in BitBucket. So far I have created the master repo and a develop branch. If I want to follow the git flow , how should I implement it? As in should I ask the other developers to checkout the developer branch and commit stuff straight to it or should they create their own branches based on the developer branch and create pull requests to when they need to commit something to developer branch ?
2 Solutions collect form web for “Settings up git workflow”
Regarding write access, either you install gitolite on your central repo server, or you manage two repositories:
- one for the developer to push to
- one for you to pull their work after review, trigger by merge request from the first one.
A classic intermediate repo would be a gerrit one, which comes with its own review system.
I would recommend starting with a simple workflow, based on GitHub-Flow at:
“A simple git branching model“, with the main elements being:
mastermust always be deployable.
- all changes made through feature branches (pull-request + merge)
- rebase to avoid/resolve conflicts; merge in to
Then, when the release cycle becomes more complexe, you can have a look at git-flow.
Where I work we have everybody use the git flow toolset. See https://github.com/nvie/gitflow/wiki/Installation for your OS. Anyway, once a developer have installed this and uses the commands provided there was much easier for us to get everybody on the same page. Especially since we use rebasing.