jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-23 03:44:00 -05:00
Code Issues Projects Releases Wiki Activity

update links and redirects for incorp. changes from pr

Browse Source
This commit is contained in:
Jules Parker
2021-10-06 16:15:23 +02:00
parent 39a5dfa0ed
commit c98f2eb4d0
20 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md
View File

@@ -60,4 +60,4 @@ If a site administrator disables the merge conflict editor for pull requests bet
## Further reading
- "[About pull request merges](/articles/about-pull-request-merges)"
- "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)"