Resolving Git conflicts

Published: 07 September 2018
on channel: Zell Liew
1,554
24

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


On this page of the site you can watch the video online Resolving Git conflicts with a duration of hours minute second in good quality, which was uploaded by the user Zell Liew 07 September 2018, share the link with friends and acquaintances, this video has already been watched 1,554 times on youtube and it was liked by 24 viewers. Enjoy your viewing!