I know the file in Myst is outdated, but I found some issues with the updated version. It looks like problem 2 describes the issues a bit incorrectly. Specifically part 1 says to change different lines in the same file, but that will produce the type of merge conflict that part 2 covers. Instead, students would need to change separate files on github and locally to produce the simple merge conflict described in part 1.
Another thing is that the pdf doesn't say much if anything about nano, so students who are expecting vim to appear might get surprised by nano appearing instead (it can be either one depending on how the machine is set up). It might be could to include a section about both and help students identify which version their computer runs by default.
I know the file in Myst is outdated, but I found some issues with the updated version. It looks like problem 2 describes the issues a bit incorrectly. Specifically part 1 says to change different lines in the same file, but that will produce the type of merge conflict that part 2 covers. Instead, students would need to change separate files on github and locally to produce the simple merge conflict described in part 1.
Another thing is that the pdf doesn't say much if anything about nano, so students who are expecting vim to appear might get surprised by nano appearing instead (it can be either one depending on how the machine is set up). It might be could to include a section about both and help students identify which version their computer runs by default.