We are going to create branches according to features and when you are done with the feature. you create another branch for the next feature you are working on. And you can only create a pull request, and inform me and i will merge. and please when you want to create a pull request on github, please please verify that the branche you want to merge to is develop. We do not have any business with the main branch for now.
These are the steps to take:
I will be using cart as an example here.
-
Check out to develop branch (git checkout develop)
-
Create your own branch. (git checkout -b cart). That command also checks out into the cart branch.
-
Write your code, commit, and push to remote. I guess we know how to commit and push our codes.
-
When you are done with the feature and now want to merge to develop, check out to develop (git checkout develop) pull, to make sure you have all current changes in develop (git pull origin develop) Check out to your cart branch, (git checkout cart) then merge in develop (git merge develop) Fix possible merge conflicts, then push to remote (git push)
-
Go on Github. Click create pull request. Choose the branches you want to merge, making sure that you're merging cart branch into develop. You can drop comments on the pull request. I will look at it and then merge it into develop
Figma Link - https://www.figma.com/file/fzlPnU0NIvjRZh4ao9A6b1/KIKA-Prototypes?node-id=153%3A4