Differences

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

--- namespace:networking [2026/06/01 17:01] – [SSHing with Claude Code] admin
+++ namespace:networking [2026/07/24 19:57] (current) – [Git Pull From New Repo] 12.144.223.107
@@ Line 56: / Line 56: @@
   * Teledyne_2 = IDK (1k), S/N: XXXXXX
   * Teledyne_3 = OffBrem/Magnetic Quads (1k), S/N: XXXXXX
+====Git Pull From New Repo====
+when a new device gets added to the mirror or when Austin improves something. You might need to Pull from the New Repo. Here are the steps
+  - make sure files are saved, and you closed out of Spyder and file reader/editor app.
+  - You always have a MASTER branch, to check,
+  - ''cd galadriel''
+  - ''git branch''
+  - If is says MASTER, then you're fine, if not, you're in a side branch
+  - to switch, ''git checkout master''
+  - then you need to check files that your might lose
+  - ''git status''
+  - it will list files that are "tracked' and 'untracked'
+  - take a picture of the "tracked' files and make copies
+  - I created a folder called "/galadriel/galadriel/Temp_For_Git/" add copies here if needed
+  - now for each file, run ''git restore /home/sedlikr/galadriel/galadriel/control/control.config''
+  - that was an examples file, but do this for each "tracked" file
+  - run again, ''git status''  and all "tracked' files should be gone.
+  - run  ''git pull''
+  - then go into your side branch, ''git checkout RS_branch''
+  - finally run, ''git merge master''
+  - reopen everything you need
+to make a branch run ''git branch <branch name>''