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?
• Why ARM Microcontrolle...
2. How to blink an LED using STM32 Nucleo Board
/ ei0u9lig9e
3. STM32 Push Button Example
• Push Button Example | ...
4. STM32 Clock and Timers Explained with Example (Part 1)
/ p1ee7gvol8
5. STM32 Clock and Timers Explained with Example (Part 2)
• Clock and Timers Expla...
6. STM32 Basic Timer Code Explained (Part 1)
• Basic Timer Code Expla...
7. STM32 Basic Timer Code Explained (Part 2)
• GPIO Handling Explaine...
8. STM32 PWM Generation
• PWM Generation | STM32...
9. STM32 PWM Generation Code Explained
• Understanding PWM Gene...
10. LED Dimming using PWM
• LED Dimming using PWM ...
11. Code explanation of LED Dimming Project
• How does PWM control t...
12. Setup a github repository
• Let's upload our proje...
13. Connecting sourcetree to our github account
• How to connect sourcet...
14. Configure STM32 Controller UART using Polling method
• Let's send using UART ...
------------------------------------------------
Other Topics
1. Integrate Clang Format Styling with Visual Studio Code
• Integrate Clang Format...
2. Integrate Clang Format Styling with IAR Embedded Workbench
• Integrate Clang Format...
3. Enabling Internet in Beaglebone black board
• Enabling Internet in B...
4. Generic Logic Analyzer Unboxing
• Generic Logic Analyzer...
5. Evolution of C Programing Language
• Evolution of C Program...

[@vyasneshkumarniranjan1542]

Beautiful 😍

[@vdevelop]

Thanks 😊

[@vyasneshkumarniranjan1542]

Please continue the stm32 series

[@vdevelop]

Sure. It will come soon!