Commit 1
Commit 2
Commit 3
Commit 4
Commit 5 - merge conflict resolution
Commit 6
Commit 7
Commit 8
Commit 9
Commit 10
Commit 11
Commit 12
Commit 13
Commit 14
git init emily_parker_hw_3_csci_5828 cd .\emily_parker_hw_3_csci_5828\
git add README.md git commit -m "commit 0" git remote add origin https://github.com/EmilyParker24/emily_parker_hw_3_csci_5828.git git branch -M main git push -u origin main git checkout -b bug-fix
git checkout main
[Edit README.md]
git add .\README.md
git commit -m "commit 1"
git push
[Edit README.md]
git add .\README.md
git commit -m "commit 2"
git push
git checkout bug-fix
[Edit README.md]
git add .\README.md
git commit -m "commit 3"
git push --set-upstream origin bug-fix
[Edit README.md]
git add .\README.md
git commit -m "commit 4"
git push
git checkout -b bug-fix-experimental
git checkout bug-fix
git merge main
*merge conflict*
[Edit README.md]
git add .\README.md
git commit -m "merge conflict resolution"
git push
[Edit README.md]
git add .\README.md
git commit -m "commit 6"
git push
git checkout bug-fix-experimental
[Edit README.md]
git add .\README.md
git commit -m "commit 7"
git push --set-upstream origin bug-fix-experimental
[Edit README.md]
git add .\README.md
git commit -m "commit 8"
git push
[Edit README.md]
git add .\README.md
git commit -m "commit 9"
git push
git checkout main
[Edit README.md]
git add .\README.md
git commit -m "commit 10"
git push
git checkout bug-fix
git merge bug-fix-experimental
*merge conflict*
[Edit README.md]
git add .\README.md
git commit -m "commit 11"
git push
[Edit README.md]
git add .\README.md
git commit -m "commit 12"
git push
git checkout main
git merge bug-fix
*merge conflict*
[Edit README.md]
git add .\README.md
git commit -m "commit 13"
git push
[Edit README.md]
[Add image]
git add commit-graph.png README.md
git commit -m "commit 14"
git push