CSCI 5828 – Spring 2018
Homework 2
Team Member: Yihua Shi, Xueyan Wu, Yijun Zhang
Due: by 11:59 PM MST on Monday, February 19, 2018
Git command:
-
git init[initialize the empty repo]
-
vim README.md[create the readme file]
-
git add .
-
git commit -m "0"
-
vim test.txt[create test.txt file for further updates]
-
git add .
-
git commit -m "1"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "2"
-
git checkout -b "bug-fix"[Switched to a new branch 'bug-fix']
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "3"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "4"
-
git merge master
-
vim test.txt[fix conflict in test.txt file]
-
git add .
-
git commit -m "5"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "6"
-
git checkout 3417b5aabccd96208dc7d207316ae115fa2a1b87[checking out to commit "4"]
-
git checkout -b "bug-fix-experimental"[Switched to a new branch 'bug-fix-experimental']
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "7"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "8"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "9"
-
git checkout master[Switched to branch 'master']
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "10"
-
git checkout bug-fix[Switched to branch 'bug-fix']
-
git merge bug-fix-experimental
-
vim test.txt[fix conflict in test.txt file]
-
git add .
-
git commit -m "11"
-
vim test.txt[edited test.txt file]
-
git add .
-
git commit -m "12"
-
git checkout master[Switched to branch 'master']
-
git merge bug-fix
-
vim test.txt[fix conflict in test.txt file]
-
git add .
-
git commit -m "13"
-
git add .[add README and git image file]
-
git commit -m "14"