How to FIX GIT MERGE CONFLICTS | Including 2 Examples How Can Git Merge Conflicts Can Happen
#git #gitmerge #gitmergeconflict
I use GitHub + VSCode in the video, yet this method can be used in any other IDE as well and is relevant to any git user.
0:00-0:21 Introduction
0:22-1:18 How a git merge conflict can happen #1 - Conflicting Pull Requests
1:19-2:10 How a git merge conflict can happen #1 - Locally merging branches
2:11-3:09 Fixing git merge conflicts - Examining the conflicts
3:10-3:43 Fixing git merge conflicts - Resolving the conflicts
3:44 Fixing git merge conflicts - Checking GitHub after resolving the conflicts
![[CANIMALS] Season 1 EP05 Rocket Can / 로켓캔](https://images.mixrolikus.cc/video/JaM62GobwEU)
![EMBERASSING A GIRL | Underground War 2.0 [ROBLOX]](https://images.mixrolikus.cc/video/xaI8iiw1dqk)
