Git Workflow
Here's the general Git workflow that you will run into:
Pull from origin main/master:
git pull origin main
Create your own development branch:
git checkout -b <your branch name>
Make your edits
Commit and push your changes to your branch:
git add <file changed> <file changed>
git commit -m "commit message"
git push --set-upstream origin <your branch name>
Open a pull request (PR) in the GitHub interface to merge into main:
Remember to never commit and push directly to main. The purpose of git is to create a way for many people to work on the same code at the same time without major conflicts.
We also would like to see a clean git history. This means:
Rebase often: try to pull the latest changes from main as needed
Make PRs for features and try not to run into conflicts
Make commits linear if possible:
As a first assignment, please complete Git Practice Assignment
Last updated