Resolving Git conflicts
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...
Website: https://zellwk.com