hwk github advanced My chamges - lahodyuk/hwk-github-advanced GitHub Wiki

STEP 1. Work with branch

Create hwk git repositories at the GitHub.com https://github.com/lahodyuk/hwk-github-advanced
Clone to PC

git branch CREATE FOLDER LIKE HWK
mkdir assets
mkdir uploads
echo "
HOLLO GitHub!!!
" > index.html Check all makups and add
git status
git add . Add comment to changes
git commit -m "add folder and file like in hwk " Got to folder assets and create 2 files (touch assets/css.js and css.js)
echo "test all.js" > all.js
echo "test css.js" > css.js Watch status, commit and add file to branch
cd ..
git status
git add .
git commit -m "add files all all.js and css.js in folder assets"
git push origin architecture Make ignor to folders UPLOADS
cd uploads
echo "/uploads/*" > .gitignore
git status
git add .
git commit -m "add file .gitignore"
git push origin architecture
git checkout master
git merge architecture
git checkout master Complit to merge and save changes
git push Delete archhotecture
git branch --delete architecture
git push origin master
git branch Persuaded only *master

STEP 2. Rebase

STEP 3. Tag

git branch
mkdir mitka
cd mitka
echo > exemple.txt
cd ..
git status
cd mitka (version)
echo "myversion" > exemple.txt
cd ..
git status
git add .
git commit -m "Add folder version with file"
git tag To get - v0
git push Change file exemple.txt
git status
git add .
git commit -m "Change file"
git tag v1 See all vetsion
git tag
git push
git push origin v1
git log ----https://git-scm.com/book/ru/v1/%D0%9E%D1%81%D0%BD%D0%BE%D0%B2%D1%8B-Git-%D0%A0%D0%B0%D0%B1%D0%BE%D1%82%D0%B0-%D1%81-%D0%BC%D0%B5%D1%82%D0%BA%D0%B0%D0%BC%D0%B8

STEP 4. Submodule

STEP 6. Conflict

GIT ADVANCED