proof reading

Author: liamjberrisford

individual_modules/introduction_to_version_control/merge_conflicts.ipynb

@@ -215,7 +215,7 @@
     "\n",
     "\n",
     "### Understanding the representation of conflicts\n",
-    "The content between the markers `<<<<<<< HEAD` and `=======` contains the changes that were made on the current branch i.e. the changes as they are at `HEAD`. In contrast, the content between the markers `=======` and `>>>>>>> main` represents the changes that have been made on the incoming branch, which in example above is `main`. (Of course, in the general case the incoming branch could be a different branch, in which case the name of this branch will be used in the third marker.)\n",
+    "The content between the markers `<<<<<<< HEAD` and `=======` contains the changes that were made on the current branch i.e. the changes as they are at `HEAD`. In contrast, the content between the markers `=======` and `>>>>>>> main` represents the changes that have been made on the incoming branch, which in the example above is `main`. (Of course, in the general case, the incoming branch could be a different branch, in which case the name of this branch will be used in the third marker.)\n",
     "\n",
     "\n",
     "In order to fix this conflict, we simply need to edit this text so that it contains\n",

individual_modules/introduction_to_version_control/questions/summary_merge_conflicts.json

@@ -9,12 +9,12 @@
                 "feedback": "Incorrect"
             },
             {
-                "answer": "A situation where Git cannot automtically resolve differences betwen branches",
+                "answer": "A situation where Git cannot automatically resolve differences between branches",
                 "correct": true,
                 "feedback": "Correct"
             },
             {
-                "answer": "An error tat occurs when there is no internet connection",
+                "answer": "An error that occurs when there is no internet connection",
                 "correct": false,
                 "feedback": "Incorrect"
             },
@@ -26,7 +26,7 @@
         ]
     },
     {
-        "question": "Which command is used to abort a merge and return the previous state?",
+        "question": "Which command is used to abort a merge and return to the previous state?",
         "type": "many_choice",
         "answers": [
             {
@@ -52,7 +52,7 @@
         ]
     },
     {
-        "question": "How does Git idnicate the conflicting sections in a file during a merge conflict?",
+        "question": "How does Git indicate the conflicting sections in a file during a merge conflict?",
         "type": "many_choice",
         "answers": [
             {