By the end of the module, the SRE will create, configure and make changes to a repo using the following commands:
init
config
clone
commit
branch
checkout
merge
rebase
rebase
-i
- Video record yourself creating a new directory, initializing a git repository and creating a simple file with text. Then, create a new branch, add to the file, go back to the master branch and merge the files. Hint: make sure you add and commit your changes on each branch!
- Video record yourself cloning a repo. Create a new branch, then go back to the master branch and make changes to a file. Checkout to your new branch and make more changes to the same file. Return to the master branch and combine the files using
rebase
. Hint: Make all these changes locally and don’t push them up to github. - Do the same thing as #2, but use
rebase -i
- Describe a scenario when you would you merge vs. rebase. Describe a scenario when you would you rebase vs. merge.
Send your deliverables to the person helping you with your learning plan.
- https://learngitbranching.js.org/
- Find
rebase
under ‘Advanced Topics’
- Find
- https://www.shortcutfoo.com/app/dojos/git
git --help
andgit help -a
- https://www.youtube.com/watch?v=tukOm3Afd8s
- https://www.youtube.com/watch?v=dO9BtPDIHJ8
- https://www.youtube.com/watch?v=SxzjZtJwOgo