Closed TatiaM closed 3 years ago
The history does not follow the history of master.
You can fix it by doing :
git pull --rebase sophietheis master
git push --force TatiaM master:master
To understand how it works : https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github https://blog.zenika.com/2017/01/24/pull-request-demystifie/
error spelling correction