scripting:netdevops
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| scripting:netdevops [2021/01/17 00:04] – jotasandoku | scripting:netdevops [2023/11/02 14:38] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | Nick Russo tuto:\\ | + | Search for '' |
| + | * [[https:// | ||
| + | * [[https:// | ||
| + | * [[https:// | ||
| + | |||
| + | |||
| + | ---- | ||
| + | |||
| + | Nick Russo tuto: | ||
| * LEAN | * LEAN | ||
| * WIP: Work In Process. In relation to ' | * WIP: Work In Process. In relation to ' | ||
| Line 40: | Line 48: | ||
| \\ | \\ | ||
| git pull: git fetch + git merge | 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 checkout master | ||
| - | git merge origin/ | + | git merge origin/ |
| - | git branch -d test | + | git branch -d test # delete (local) brach. No needed, just merged in! |
| | | ||
scripting/netdevops.1610841868.txt.gz · Last modified: (external edit)
Page Tools
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
