Resolving Git conflicts
1,555 views · Published 7 September 2018 · 9:58 · Indexed 24 October 2026
Channel: Zell Liew · 2018 · Science & Technology
A Git conflict happens when Git has no idea whether the remote version or the local version is the correct version. You'll learn how to resolve a Git conflict today. TIMESTAMPS ===== - 00:00 - What is a Git Conflict - 00:40 - Producing a conflict - 03:45 - Resolving a conflict - 08:40 - Preventing conflicts from happening LINKS ===== - Text / Podcast version: https://zellwk.com/blog/resolving-git-conflicts - Website: https://zellwk.com
More from this channel
-
30:17
99u part2
-
3:31
Zellwk #01: Should you use semicolons in Javascript? #
-
3:14
Zellwk #02: Console.log everything!
-
4:50
Zellwk #03: How to debug Javascript errors
-
9:30
Zellwk #04: How to make interactive components
-
15:00
Zellwk#05: How do deal with imposter syndrome?
-
2:00
Thank you! :)
-
7:10
Visual Code Studio setup—Part 3 (extensions)