How to resolve git merge conflicts (VSCode)

Published: 18 November 2023
on channel: Concise Developer
4,069
34

Full VSCode course:
https://www.udemy.com/course/masterin...
How to resolve git merge conflicts (VSCode)

0:00 Video intro
0:50 Create new branch
3:09 Create new pull request
4:09 git checkout main
4:15 git pull
4:30 switch back to conflicting branch
4:48 git merge main
5:10 resolve conflicts
6:54 commit resolved conflicts
7:12 merge pull request


Watch video How to resolve git merge conflicts (VSCode) online without registration, duration hours minute second in high quality. This video was added by user Concise Developer 18 November 2023, don't forget to share it with your friends and acquaintances, it has been viewed on our site 4,069 once and liked it 34 people.