resolved slight merge conflict

Added a bit on commit messages and pulling
2024-09-19 11:12:17 +01:00 · 2024-09-19 11:09:46 +01:00
2 changed files with 9 additions and 0 deletions
--- a/src/slides/compsoc/3_git.md
+++ b/src/slides/compsoc/3_git.md
@ -98,4 +98,10 @@ Let's start with the basics.
 LIVE DEMONSTRATION TIME
 -------------------------------------------------------------------------
 GET OUT YOUR LAPTOP
+-------------------------------------------------------------------------
+# DO NOT DO THIS
+![BAD](3_git/bad_message.png)
+-------------------------------------------------------------------------
+# PLEASE DO THIS
+````git pull <remote_name> <branch_name>````
 -------------------------------------------------------------------------
--- a/src/slides/compsoc/3_git/bad_message.png
+++ b/src/slides/compsoc/3_git/bad_message.png
Author	SHA1	Message	Date
Prabuddha Hans	5399154a5e	resolved slight merge conflict	2024-09-19 11:12:17 +01:00
Prabuddha Hans	733fe359fa	Added a bit on commit messages and pulling	2024-09-19 11:09:46 +01:00