episode on forking/cloning/browsing

coderefinery · Sep 14, 2024 · f917c3b · f917c3b
1 parent 4a8bba2
commit f917c3b
Show file tree

Hide file tree

Showing 13 changed files with 1,117 additions and 2 deletions.
diff --git a/content/index.md b/content/index.md
@@ -44,10 +44,12 @@ constructive code feedback.
 
 - 13:30-14:45 - {ref}`version-control` (1/2)
   - {ref}`version-control-motivation` (15 min)
-  - Forking, cloning, browsing, and creating branches and commits
+  - {ref}`browsing` (30 min)
+  - {ref}`branching-and-committing` (30 min)
 
 - 15:00-16:30 - {ref}`version-control` (2/2)
-  - Merging and conflict resolution
+  - Merging (40 min)
+  - Conflict resolution (30 min)
   - {ref}`practical-advice` (20 min)
   - {ref}`sharing-repositories` (30 min)
 

diff --git a/content/version-control.md b/content/version-control.md
@@ -6,6 +6,8 @@
 :maxdepth: 1
 
 version-control/motivation.md
+version-control/browsing.md
+version-control/branching-and-committing.md
 version-control/practical-advice.md
 version-control/sharing.md
 ```
diff --git a/content/version-control/branching-and-committing.md b/content/version-control/branching-and-committing.md
@@ -0,0 +1,5 @@
+(branching-and-committing)=
+
+# Creating branches and commits
+
+(work in progress)