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-20 10:28:40 -05:00
Code
Issues
Projects
Releases
Wiki
Activity
Files
e7b6146b901bdd3dc83ca9490a562a9f4ac3f28c
docs
/
content
/
pull-requests
/
collaborating-with-pull-requests
/
addressing-merge-conflicts
History
Isaac Brown
aa1a293023
Remove
product_name
from
pull-requests
directory (
#54015
)
2025-01-20 16:34:52 +00:00
..
about-merge-conflicts.md
Remove
product_name
from
pull-requests
directory (
#54015
)
2025-01-20 16:34:52 +00:00
index.md
Remove github-ae from lib/all-versions.js (
#49235
)
2024-02-20 12:54:34 +00:00
resolving-a-merge-conflict-on-github.md
Remove
product_name
from
pull-requests
directory (
#54015
)
2025-01-20 16:34:52 +00:00
resolving-a-merge-conflict-using-the-command-line.md
Remove
product_name
from
pull-requests
directory (
#54015
)
2025-01-20 16:34:52 +00:00