A previous version of this tutorial used the following material and it may be used again in the future…
Fork the repository at https://github.com/aezarebski/conflict-resolution-example and merge the pull request. Note that this will require resolving the conflict in a sensible way. Explain what you did (in <100 words). If you have done this well, the commit log should look like Figure fig:merge-task.
