Peter Bengtsson
|
97d8746422
|
cleaning up trailing slash redirects (part 9) (#23781)
|
2021-12-17 08:27:06 +00:00 |
|
Perry Fraser
|
db54aa084f
|
fix: missing paren in link in "Resolving a merge conflict on GitHub"
|
2021-11-14 21:55:58 -05:00 |
|
Tanner
|
baabf60642
|
Add the missing closing parenthesis for link
|
2021-11-08 12:56:46 -08:00 |
|
Tanner
|
5117bedc8e
|
Revert formatting as this pages link was good
|
2021-11-08 12:55:58 -08:00 |
|
Tanner
|
48b8461aee
|
Remove double quotes surrounding link so it renders correctly
|
2021-11-08 12:42:04 -08:00 |
|
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 |
|
Jules Parker
|
1aa0ee7ec1
|
add versioning to new articles
|
2021-10-18 15:48:05 +02:00 |
|
Jules Parker
|
13edfd8788
|
Merge branch 'main' into jules-4795
|
2021-10-18 15:11:48 +02:00 |
|
Jules Parker
|
c98f2eb4d0
|
update links and redirects for incorp. changes from pr
|
2021-10-06 16:15:23 +02:00 |
|
Jules Parker
|
d84921d647
|
update redirects for addressing-merge-conflicts
|
2021-10-06 15:25:47 +02:00 |
|
Jules Parker
|
78271efc74
|
directory deletions and creations with new index
|
2021-10-06 14:26:53 +02:00 |
|