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 Microcontrollers are so popul...

2. How to blink an LED using STM32 Nucleo Board
ei0u9lig9e

3. STM32 Push Button Example
Push Button Example | STM32 Cube IDE ...

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

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

6. STM32 Basic Timer Code Explained (Part 1)
Basic Timer Code Explained | STM32G47...

7. STM32 Basic Timer Code Explained (Part 2)
GPIO Handling Explained | STM32G474 |...

8. STM32 PWM Generation
PWM Generation | STM32G474 Nucleo | E...

9. STM32 PWM Generation Code Explained
Understanding PWM Generation | STM32 ...

10. LED Dimming using PWM
LED Dimming using PWM | STM32 G474 Nu...

11. Code explanation of LED Dimming Project
How does PWM control the LED brightne...

12. Setup a github repository
Let's upload our projects to Git | ST...

13. Connecting sourcetree to our github account
How to connect sourcetree to our Gith...

14. Configure STM32 Controller UART using Polling method
Let's send using UART Polling method ...

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

2. Integrate Clang Format Styling with IAR Embedded Workbench
Integrate Clang Format Styling with I...

3. Enabling Internet in Beaglebone black board
Enabling Internet in Beaglebone black...

4. Generic Logic Analyzer Unboxing
Generic Logic Analyzer Unboxing

5. Evolution of C Programing Language
Evolution of C Programming Language i...

• #science_technology
• #embedded
• #debug
• #electronics
• #technology
• #tech
• #linux
• #code
• #coder
• #developer
• #programmer
• #coding
• #kernel
• #embedded_systems
• #iar
• #workbench
• #stm32
• #avr
• #arduino
• #atmega
• #vscode
• #visual_studio_code
• #git
• #conflicts
• #resolve
• #sourcetree
• #merge