[Script Info]
Title: 
[Events]
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
Dialogue: 0,0:00:00.47,0:00:03.57,Default,,0000,0000,0000,,I've just resolved the merge conflict\Nby moving my change of splitting
Dialogue: 0,0:00:03.57,0:00:07.45,Default,,0000,0000,0000,,the asteroid into two fragments into\Nthe new breakIntoFragments function.
Dialogue: 0,0:00:08.58,0:00:12.11,Default,,0000,0000,0000,,However, I still need to let git\Nknow that the conflict is resolved.
Dialogue: 0,0:00:12.11,0:00:14.52,Default,,0000,0000,0000,,I can do this by\Ncommitting the resolution.
Dialogue: 0,0:00:14.52,0:00:16.17,Default,,0000,0000,0000,,First I'll save the file.
Dialogue: 0,0:00:16.17,0:00:19.39,Default,,0000,0000,0000,,Then I'll go back to the command\Nline and run git status.
Dialogue: 0,0:00:19.39,0:00:22.81,Default,,0000,0000,0000,,This time, instead of showing\Ngame.js as simply modified,
Dialogue: 0,0:00:22.81,0:00:25.55,Default,,0000,0000,0000,,git shows the file was both modified.
Dialogue: 0,0:00:25.55,0:00:29.47,Default,,0000,0000,0000,,That's because both branches modified\Nthe file and then there was a conflict.
Dialogue: 0,0:00:29.47,0:00:32.95,Default,,0000,0000,0000,,I resolved the conflict, though, so\NI'll add the file to the staging area.
Dialogue: 0,0:00:34.39,0:00:39.00,Default,,0000,0000,0000,,Now I'll run git status again, and\Ngit says, all conflicts are fixed but
Dialogue: 0,0:00:39.00,0:00:40.46,Default,,0000,0000,0000,,you are still merging.
Dialogue: 0,0:00:40.46,0:00:42.79,Default,,0000,0000,0000,,Use git commit to conclude the merge.
Dialogue: 0,0:00:42.79,0:00:43.78,Default,,0000,0000,0000,,So I'll go ahead and
Dialogue: 0,0:00:43.78,0:00:48.86,Default,,0000,0000,0000,,do that, and once again git has already\Nfilled in a commit message for me.
Dialogue: 0,0:00:48.86,0:00:52.83,Default,,0000,0000,0000,,This time it notes that I just merged\Nthe master branch into easy-mode, and
Dialogue: 0,0:00:52.83,0:00:54.74,Default,,0000,0000,0000,,that there was a conflict in game.js.
Dialogue: 0,0:00:55.78,0:00:58.48,Default,,0000,0000,0000,,Like before, I could change\Nthis message if I wanted to.
Dialogue: 0,0:00:58.48,0:01:00.80,Default,,0000,0000,0000,,But this message describes\Nthe commit well, so
Dialogue: 0,0:01:00.80,0:01:03.24,Default,,0000,0000,0000,,I'll leave the message as it is and\Nquit.
Dialogue: 0,0:01:03.24,0:01:04.82,Default,,0000,0000,0000,,Now I'll run git log.
Dialogue: 0,0:01:04.82,0:01:07.07,Default,,0000,0000,0000,,Notice that only one\Nnew commit was created.
Dialogue: 0,0:01:08.18,0:01:12.03,Default,,0000,0000,0000,,Git didn't create a separate merge\Ncommit and a conflict resolution.
Dialogue: 0,0:01:12.03,0:01:14.02,Default,,0000,0000,0000,,Instead, it just put them\Nboth in the same commit.
Dialogue: 0,0:01:15.35,0:01:18.29,Default,,0000,0000,0000,,Now to get practice resolving\Na merge conflict, go and
Dialogue: 0,0:01:18.29,0:01:21.55,Default,,0000,0000,0000,,merge master into easy-mode\Non your own computer.
Dialogue: 0,0:01:21.55,0:01:24.69,Default,,0000,0000,0000,,When you're done,\Nrun the command, git log -n 1 and
Dialogue: 0,0:01:24.69,0:01:26.43,Default,,0000,0000,0000,,paste the output in this box.
Dialogue: 0,0:01:26.43,0:01:30.95,Default,,0000,0000,0000,,The -n flag means that git log will\Nonly show that number of commits,
Dialogue: 0,0:01:30.95,0:01:31.72,Default,,0000,0000,0000,,in this case, one.