This section helps you to perform a merge. Get all other branches and merge it in the develop branch. Then, the new features will become part of the project.
These steps are performed by the main programmer(s). No one is authorized to perform changes on develop alone, without advising others members of the team.
git checkout developgit pull
First, go to develop branch and update it.
git fetch --all
Then, download all others branches.
git merge origin/feat_branch
Then, make a merge with one of the others branch. If everything is ok, git will merge the modified files and commit it. Maybe, it can ask you to enter a commit message.
If things go wrong, git will advise you that there are CONFLICTs and will point the problematic files and
changes.
You have to go to these files and solve the merge manually, after, perform a
git commit -m "message".
If it is too difficult, maybe this branch was not very well
changed and you can use git merge --abort to cancel this attempt
Small changes can be done in develop using git commit. Usually it is made to fix some small
problems or bugs.
Finally, you can do git push to update the remote develop.
git checkout mastergit merge developgit push
If you have a good candidate for a release, you can merge develop to master.