I want to ask if the following workflow is correct! It is referring to a small private team. There is a master branch where no one merges there ( except the maintainer ), a development branch and individual branches for every user. So,every user will push to development branch.
* clone the repo to your local machine git clone https://github.com/username/project.git * cd project * git remote add upstream https://github.com/group/project.git * git checkout userbranch * git add files git commit -m ".." * git push origin userbranch ( I am not sure if this step is necessary since I * Merge into development and push your work to development git checkout development git merge --no-ff userbranch git push origin development * Update local master to apply changes from master to the local repository. git checkout userbranch ( or checkout local master? ) git fetch upstream git merge upstream/development * git push origin development
I am not sure if all the sequence is right (I don't want to make any mistakes!). Also, I am not sure about the steps where I say
Update local master to apply changes from master to the local repository and
Merge into development and push your work to development if they work as expected.
And at the last step do I have to checkout on my branch or my local master?
And finally , (if the above is correct ) at which point do I fetch and merge from master branch?Generally,how can I combine master and development branches?