Laracasts is packed full with over 1,000 lessons just like this one.
Sign up to get full access or
to your account and sit back.
Published On Jul. 20th 2015
Run Time 5:02
From time to time, you'll encounter a merge conflict. Yikes! How is Git supposed to know which piece of code you wish to favor, when it has been modified on two separate branches? Well, it doesn't! That's your job.