Jules Parker bb4c5077ac Update content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md ...

Co-authored-by: Felicity Chapman <felicitymay@github.com>

2021-10-26 09:42:43 +02:00

..

collaborating-with-pull-requests

Update content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md

2021-10-26 09:42:43 +02:00

committing-changes-to-your-project

Merge branch 'main' into jules-4795

2021-10-18 15:11:48 +02:00

index.md

Update introduction

2021-10-20 15:43:11 +02:00