1
0
mirror of synced 2026-01-06 06:02:35 -05:00
Files
docs/content/github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts.md
Vanessa Yuen 3df90fc9b8 Hello git history spelunker!
Are you looking for something? Here is all of the GitHub Docs history in one single commit. Enjoy! 🎉
2020-09-27 14:10:11 +02:00

326 B

title, intro, mapTopic, redirect_from, versions
title intro mapTopic redirect_from versions
Addressing merge conflicts If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request's changes. true
/articles/addressing-merge-conflicts
free-pro-team enterprise-server
* *