Fix lesson on conflict resolution

UCL · Aug 19, 2024 · 614c32c · 614c32c
1 parent f901137
commit 614c32c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/ch00git/04Publishing.ipynb.py b/ch00git/04Publishing.ipynb.py
@@ -125,7 +125,6 @@
 # ### Git will not by default commit your new file
 
 # %% attributes={"classes": [" Bash"], "id": ""} jupyter={"outputs_hidden": false} magic_args="--no-raise-error" language="bash"
-# git add lakeland.md
 # git commit -m "Try to add Lakeland"
 
 # %% [markdown]

diff --git a/ch00git/05Collaboration.ipynb.py b/ch00git/05Collaboration.ipynb.py
@@ -46,7 +46,6 @@
 
 # %% language="bash"
 # pwd
-# rm -rf github-example # cleanup after previous example
 # rm -rf partner_repo # cleanup after previous example
 #
 
@@ -362,7 +361,7 @@
 
 # %% jupyter={"outputs_hidden": false} language="bash"
 # git add Wales.md
-# git commit -m "Resolve conflicts"  # commit the resolved changes
+# git commit --no-edit # I added a No-edit for this non-interactive session. You can edit the commit if you like.
 
 # %% jupyter={"outputs_hidden": false} language="bash"
 # git push