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

..

about-merge-conflicts.md

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

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

index.md

Merge branch 'main' into jules-4795

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

resolving-a-merge-conflict-on-github.md

add versioning to new articles

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

resolving-a-merge-conflict-using-the-command-line.md

add versioning to new articles

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