Git test

[TOC]

Lab 1

brew install git

Lab 2

git init

git config --global-user-name "zxcj04"
git config --global-user-email "zxcj04@gmail.com"

git clone https://github.com/zxcj04/gitTest.git

git add .

git commit -m "new a.py"

git push

(adding README on site)

git push

git pull

Lab 3

git branch newfile

git checkout newfile

git add .
git commit -m "new file"
git push

git push --set-upstream origin newfile

(change a.py)

git add a.py
git commit -m "making conflicts"
git push

git checkout master

(change a.py)

git add a.py
git commit -m "making conflicts on master branch"
git push

git merge newfile

(changing the right thing)

git add .

git commit -m "fix conflict"

git push

(adding issue on github site)

(comment and close it)

gitk --all

Lab 4

(add cal.py and testCalc.py)
(add .travis.yml)

git add .
git commit -m "travis"
git push

Lab 4_PLUS

(add deploy to .travis.yml) (get api key to travis variable)

(add Procfile file)

git add .
git commit -m "heroku"
git push .

(open APP)

(test add api)