How to resolve git merge conflicts using Source tree and Visual Studio Code ?

In this video we are discussing on methods used to resolve merge conflicts. First we will discuss about the conventional method using source tree and finally we will see much easier method using popular code IDE Visual Studio Code.

Hope you guys will enjoy this!

#vdevelop #wedevelop
------------------------------------------------
If you want to build a career in embedded systems and arm platform areas, I've started this video series (Master your controller) and it will teach you all the necessary peripherals associated with microcontrollers. You can consider subscribing to my channel if you like my videos.

------------------------------------------------
You can also watch following videos in this series:
1. Why ARM controllers are so popular?

2. How to blink an LED using STM32 Nucleo Board

3. STM32 Push Button Example

4. STM32 Clock and Timers Explained with Example (Part 1)

5. STM32 Clock and Timers Explained with Example (Part 2)

6. STM32 Basic Timer Code Explained (Part 1)

7. STM32 Basic Timer Code Explained (Part 2)

8. STM32 PWM Generation

9. STM32 PWM Generation Code Explained

10. LED Dimming using PWM

11. Code explanation of LED Dimming Project

12. Setup a github repository

13. Connecting sourcetree to our github account

14. Configure STM32 Controller UART using Polling method

------------------------------------------------
Other Topics
1. Integrate Clang Format Styling with Visual Studio Code

2. Integrate Clang Format Styling with IAR Embedded Workbench

3. Enabling Internet in Beaglebone black board

4. Generic Logic Analyzer Unboxing

5. Evolution of C Programing Language