Chic

Git protocol

To update your feature branch

• Go to your local dev branch: git checkout dev
• Pull the updates: git pull origin dev
• Switch to your feature branch: git checkout <feature-branch>
• Merge the updates from develop to your feature branch: git merge dev
• resolve any conflicts

To add your changes

On VsCode:

• Prerequisite: Your feature branch should be updated to the newest version of the dev branch
• Prerequisite: You should current be on your feature branch
• git add <files>
• git commit -m "... Name <[email protected]>"
• git push origin feature-branch (creating a remote version of your feature branch)

On Github (When you are ready to send your changes to the dev branch)

• Your feature branch should now be on Github
• Go to Pull requests on the top navigation bar
• click on New Pull Request
• Set your base to dev
• Set your compare to your feature branch
• Click create pull request (DO NOT MERGE PULL REQUEST)
• Ask someone to review your pull request
• after a review, you can merge the pull request into dev branch

YOU SHOULD NEVER:

• git push origin dev
• git push origin main