Merge pull request #1 from JuanBSoares/dev

ssh-juan · web-flow · commit 228dc575d50b · 2024-07-15T19:01:50.000-03:00
Dev
diff --git a/git-crash-course/hello b/git-crash-course/hello
@@ -0,0 +1 @@
+branch version 2
diff --git a/git-crash-course/readme.md b/git-crash-course/readme.md
@@ -85,14 +85,50 @@ git commit -m "comments"
 
 ## Branches
 
-TO DO
+<<<<<<< HEAD
+List of branches
+```
+git branch
+```
+
+Create a new branch
+```
+git branch {name}
+```
+
+Checkout the branch (switch to that branch)
+```
+git checkout {dev}
+```
 
 ## Remotes
 
+We can add remotes but often you will just add remote via upstream when adding a branch.
+
+```ssh
+got remote add ...
+git branch -u origin new-feature
+```
+
 ## Stashing
 
+```
+git stash list
+git stash
+git stash save my-name
+git stash apply
+git stash pop
+```
+
+* NOT USE IN A CLOUD ENV, BECAUSE YOU CAN LOST DATA
+
 ## Merging
 
+```
+git checkout dev
+git merge main
+```
+
 ## Add
 
 When we want to stage changes that will be included in the commit.
