How to use Git - Git Video Tutorial - Part 5 (More Merge Conflicts)

Jason Semko 1,6151K
16,758 views

Transcript

The interactive transcript could not be loaded.
Rating is available when the video has been rented.
This feature is not available right now. Please try again later.
Uploaded on Oct 30, 2011

Part 5!

Oy I went over my 10 minute time limit and had to split this video into two. (I don't say OY because I'm Jewish, I'm not, I know you care)

Having merge conflicts can be one of the scariest things in git especially if you're new. The wrong combination/work flow could erase someone's code and potentially result in tar and or feathering. (I suggest you quit your company if this could potentially happen)

These two videos detail two different ways of dealing with merge conflicts (The two parts are shown in part 5)

As always if you all have any questions or comments feel free to ask.


Colors:
git config color.ui true

When autoplay is enabled, a suggested video will automatically play next.

Up next

to add this to Watch Later

Add to