made line clearer. added more git content

Author: tguyenn

docs/_assets/images/line_sensor_wire_diagram.png

@@ -101,6 +101,19 @@ At commit B, a new branch called `feature-branch` is created. From this branch,
 ## How to deal with merge conflicts
 A **merge conflict** occurs when you try to merge (i.e. git pull) two branches that have made different changes to the same part of a file. Git can't automatically figure out which change to keep, so it needs your help to resolve the conflict.
 
+{: .highlight}
+Note that a `git pull` that triggers a merge conflict may open a terminal text editor like Vim or Nano.
+
+**For Vim:**
+- To save and continue: Press `Esc`, type `:wq`, then press `Enter`
+- To abort: Press `Esc`, type `:q!`, then press `Enter`, then run `git merge --abort`
+
+**For Nano:**
+- To save and continue: Press `Ctrl+O`, press `Enter`, then press `Ctrl+X`
+- To abort: Press `Ctrl+X`, press `N` if prompted to save, then run `git merge --abort`
+
+{: .callout-blue}
+
 In the problem file, Git marks the conflicting area with special markers that looks something like this:
 
 ```cpp
@@ -137,3 +150,4 @@ int main() {
 }
 ```
 
+Once you've done that, you can then stage your merge fix changes and commit them (`git add .` followed by `git commit -m "<message>"`)

docs/_sections/_guide-primaries/getting-started/git.md

@@ -42,6 +42,8 @@ Here is a wiring diagram:
 | SDA       |  GPIO21   |
 | SCL     |  GPIO22    |
 
+If you're not sure about the ESP32 pinout, then check out [this page!](https://ut-ras.github.io/RobotathonESP32/getting-started/microcontroller-interface)
+
 {: .highlight}
 Make sure to connect the color sensor's power pin to 3.3V! A 5V connection will fry the sensor.
 {: .callout-blue}

docs/_sections/_guide-primaries/sensors-and-actuators/color-sensors.md

@@ -16,7 +16,7 @@ This side of the sensor will be facing the floor to detect the line:
 <img src="{{ '/_assets/images/line_sensor_diodes.png' | prepend: site.baseurl }}" alt="line_sensor_diodes.png">
 
 {: .highlight}
-Note: You do NOT have to use all 8 of the LED/phototransistor pairs — You can leave the ones you do not want to use disconnected from the ESP32.
+You do NOT have to use all 8 of the LED/phototransistor pairs — You can leave the ones you do not want to use disconnected from the ESP32.
 {: .callout-blue}
 
 <img src="{{ '/_assets/images/line_sensor_wire_diagram.png' | prepend: site.baseurl }}" alt="line_sensor_wire_diagram.png">
@@ -26,7 +26,12 @@ Note: You do NOT have to use all 8 of the LED/phototransistor pairs — You can
 | 5V | 5V                      |
 | GND         | GND      |
 | Signal      |  Any ADC Capable Pin (i.e. GPIO32)    |
-| Signal      |  Any ADC Capable Pin (i.e. GPIO33)    |
+
+If you're not sure about the ESP32 pinout, then check out [this page!](https://ut-ras.github.io/RobotathonESP32/getting-started/microcontroller-interface)
+
+{: .highlight}
+This wiring diagram only shows the situation where 1 IR/phototransistor pair is used. If you want to use more, simply use more ADC capable pins
+{: .callout-blue}
 
 ## Programming
 The following program will allow you to continuously read the sensor data from 2 of the photodiode sensors. You will have to calibrate the sensors by positioning the ones you want to use directly over  the black electrical tape. If you need to use more than 2 sensors, then you can also move the line sensor back and forth over the black electrical tape to calibrate it.