Search for netdevops ansible vagrant cisco and complete the sections below. Examples:


Nick Russo tuto:

Travis-CICD


yamllint

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

 git fetch && git merge origin/master  


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 *


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?