Adding my name to the participants.csv file

[Anais-A]

Test to see if I did everything alright

[zaccharieramzi]

Here you have conflicting file, because you didn't pull the upstream branch which has been modified by 2 prior PRs (#2 and #4 ).

What you need to do is the following:

• Locally, go on your master branch (git checkout master).
• Pull the master of the original repo (git pull upstream master).
• Go back to your branch (git checkout mybranch). Btw, don't forget to have a better branch name next time.
• Now you have to merge the master branch in your feature branch (git merge master).
• You will surely have a conflict to handle because the prior PRs also modified the participants.csv file. Open your editor and solve the conflict. Btw, take inspiration from the other PRs (#2 and #4 ) to see how to add your name to the participants.csv file (that is on a new line, because it's a csv file).
• Once you solved the conflict, stage the file (git add participants.csv) and commit it (git commit -m'solved the merge conflict and corrected the participants file').
• You can now push to your distant repo, which will update both your branches on GitHub (git push).

Tell me if you have any issues.