This website requires JavaScript.
Explore
Help
Register
Sign In
jprdonnelly
/
docs
Watch
1
Star
0
Fork
0
You've already forked docs
mirror of
synced
2025-12-21 10:57:10 -05:00
Code
Issues
Projects
Releases
Wiki
Activity
Files
0a9fa743578b49b98fcc8c0135190cb15e78d82c
docs
/
content
/
github
/
collaborating-with-pull-requests
/
addressing-merge-conflicts
History
Rachael Sewell
7398c30364
remove 2.21 markup (
#20954
)
2021-08-19 18:18:00 +00:00
..
about-merge-conflicts.md
ran script/content-migrations/use-short-versions.js
2021-06-24 10:21:07 -04:00
index.md
add short titles to frontmatter (
#20131
)
2021-06-24 11:02:53 -07:00
resolving-a-merge-conflict-on-github.md
remove 2.21 markup (
#20954
)
2021-08-19 18:18:00 +00:00
resolving-a-merge-conflict-using-the-command-line.md
add short titles to frontmatter (
#20131
)
2021-06-24 11:02:53 -07:00