Differences

This shows you the differences between two versions of the page.

--- scripting:netdevops [2021/01/16 16:28] – jotasandoku
+++ scripting:netdevops [2023/11/02 14:38] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
-Nick Russo tuto:\\
+Search for ''netdevops ansible vagrant cisco'' and complete the sections below. Examples:
+  * [[https://www.packetswitch.co.uk/vagrant-netdevops/]]
+  * [[https://www.youtube.com/watch?v=tN6R2Tukw0M]]
+  * [[https://www.ciscolive.com/c/dam/r/ciscolive/emea/docs/2019/pdf/BRKDCN-2011.pdf]]
+----
+Nick Russo tuto:
   * LEAN
   * WIP: Work In Process. In relation to 'lean'
@@ Line 10: / Line 18: @@
-git pull vs git fetch: pull puts it in your working directory. Pull is just a Macro:  PULL=FETCH+MERGE.
+Do not pull, just fetch and merge (and check the diff).[[https://longair.net/blog/2009/04/16/git-fetch-and-merge/|External Link]]
    git fetch && git merge origin/master
 {{:automation:pullfetchmerge.jpeg?200|}}\\
@@ Line 16: / Line 24: @@
   git fetch
-  git diff ...origin  # fetches origin and shows the differences
+  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)
 \\
@@ Line 33: / Line 48: @@
 \\
   git pull: git fetch + git merge
-  git fetch -p
+  git fetch -p # -p is to prune the remote branch
-  git branch -all
+  git branch -a # shows both local and remote branches
 \\
--- merge
+----
+MERGE IN FOUR STEPS
+  git fetch -p
   git checkout master
-  git merge origin/master
+  git merge origin/master   # (local) master is updated to the newest code
-  git branch -d test
+  git branch -d test        # delete (local) brach. No needed, just merged in!

dokucama

User Tools

Site Tools

Differences

Page Tools