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

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

[@misterexo]

Very clear and dynamic classes. Greetings from Brazil!!

[@Kparris7]

Thanks for the tutorials man, it's surprisingly hard to find good tutorials explaining this

[@vijayjoseph8164]

I like all of your video series. Thank you so much for sharing

[@nmartinable]

I noticed the same thing lately on Mac OSx closing opendiff manually from the dock allowed GIt to continue. Great tutorials BTW. Keep up the good work.

[@dogdutyascetic]

Good video series. Talented teacher!

[@miladhadidi1583]

Thank you Jason, It was the best and fun tutorial i had so far on Git. You have the very god ability to teach:)

[@nascob]

Hey man! Great video! I am learning a lot.
Just a random thought sprang to mind when I was watching it.
When you saved the merge in FileMerge, you closed the window but you didn't quit it (CMD+Q). That means that the app is still open and git thinks that you're still using it.
If you do quit it every time after you save you should get prompted if you the merge was successful.
It's a wild guess, but do give it a try next time!
Keep up the good work!

[@OscarShen1]

awesome video! very helpful! Thanks alot

[@josipmatic4732]

It's little bit older video but still work! Thanks :)

[@thejacenxpress]

@gre3ns0ul Thanks for the comment! I have a buddy who uses a git plugin for eclipse (He's not too much into command line). I've never used it before mainly because of the simplicity of the command line itself. Keep in mind that the command line with gitk (type gitk) is enough for most. He does complain that when he has conflicts he has to do a lot more work-around to achieve the same stuff. I've been on projects with nearly 400 files using git and it worked perfectly with 6 devs!

[@javawocky]

Thanks did my first merge!

[@am5a03]

thanks, a nice vid for git newbie

[@coder10]

Great video

[@hiKrittiya]

Thank you!

[@thejacenxpress]

Thanks, I'll try that out next time it happens...it actually has not happened in a long while...not sure if it was a bug that has been fixed...but it was occurring about 20% of the time with same procedure.

[@GautamThakur]

thanks a lot

[@nmartinable]

Git is not 'flaky'. Git is waiting for the opendiff process to end. Notice in your dock that opendiff is still open. Close it and Git will continue with merge. Exiting Git is not necessary.

[@chopcooey]

if you merge the code and at the same time homer does another push while you are merging the code, you will have to merge it again?