What is a Merge Conflict? [Advanced Git Tutorial]

Thanks for making this tutorial! I'm new to GitKraken so this video was very helpful.

but im having merge conflicts despite my code being on different files :(

What happens if I click save when I resolve the conflict on a file by clicking save, can I undo that action after I click save?

I don't get the option to merge. I only get the option to view the PR on Github, but that doesn't help in any way. I have conflicts that can only be resolved from the command line. Help.

Can you make a video on cherry-picking?

Finally understand what is it in second conflict way... Thanks!

Looks like I'll try this tool for my next merge conflict. I usually use vsmergetool and powershell command line. shrugs Wish me luck.