dokucama

This is an old revision of the document!

---

Nick Russo tuto:

• LEAN
• WIP: Work In Process. In relation to 'lean'
• JIT: Fast and frequent delivery,

Travis-CICD

• Workers like workers in an office. One passes the tasks ti the other one

yamllint

Do not pull, just fetch and merge (and check the diff).External Link

 git fetch && git merge origin/master  

• git fetch to know the changes done in the remote repo/branch since your last pull. This is useful to allow for checking before doing an actual pull

git fetch    
git diff ...origin  # fetches origin and shows the differences (same as 'git diff master origin/master')
git merge origin/master

Also we normally use push but it really means:

git push origin mylocalbranch   # format:  git push <remote> <branch>  

Concept of master (my local one) origin/master (remote)

git init .
git add .   ! rechech this in my bastion notes

---

vim :e :bn in vim seems to go tabs before and after!!

git pull: git fetch + git merge
git fetch -p # -p is to prune the remote branch
git branch -a # shows both local and remote branches

— MERGE IN FOUR STEPS

git fetch -p

git checkout master
git merge origin/master   # (local) master is updated to the newest code
git branch -d test        # delete (local) brach. No needed, just merged in!

---

ansible *

• import_playbook sjdhs.yml (inside another playbook)
• configure ansible with debug and stuff so the config diffs are shown (check video)

---

vim :e :bn in vim seems to go tabs before and after!!

---

git pull: git fetch + git merge

git fetch -p

git branch -all

---

merge git checkout master git merge origin master git branch -d test

---

git checkout – . # quick rollback?