It takes a while to get used to working on github however its a fairly important concept so in general we follow these rules:
create issues for each feature
create a new branch for one feature :deciduous_tree:
do some changes, add and then commit them using the commit message to relate to an issue (relates #1)
checkout to master branch and git pull
checkout to the branch you were working on and git merge master
if you have merge conflicts you should solve them now
git push and create your PR and assign your fellow team mates as reviewers
all team members should then review your code and either approve :white_check_mark: or request changes :x:
the final team member to review can merge the PR :tada: and delete the branch :wastebasket:
NEVER merge your own PR :no_entry_sign:
if everything to do with the issue is complete you can then close the issue :raised_hands:
By creating issues you know exactly what work you are doing and so do your teammates. It is also worth noting the title and description of your commits and PR should explain what work you have done. I should be able to come to your project and view a coherent story of PR to see how your project has developed over time.
It takes a while to get used to working on github however its a fairly important concept so in general we follow these rules:
git pull
git merge master
git push
and create your PR and assign your fellow team mates as reviewersBy creating issues you know exactly what work you are doing and so do your teammates. It is also worth noting the title and description of your commits and PR should explain what work you have done. I should be able to come to your project and view a coherent story of PR to see how your project has developed over time.