TheoPannetier / merging_short_stories

GitHub repo for learning how to handle merge conflicts

merging_short_stories

The goal of this repository is to learn how to commit and merge files on a GitHub repository. This is very important for writing code collaboratively.

Thanks a lot to @richelbilderbeek for the idea! 👍