LICENSE

[re1developer471]

[email protected] [email protected] Skip to content
skills
/
resolve-merge-conflicts
Public template
generated from skills/template-template
Learn why conflicts happen and how to resolve them.

License
CC-BY-4.0 license
35 stars 15 forks
Code
Issues
2
Pull requests
Actions
Security
Insights
skills/resolve-merge-conflicts
Latest commit

sinsukehlab
…
on Jul 13
Git stats
Files
Type
Name
Commit time
.github
6 months ago
.github
.gitignore
9 months ago
.gitignore
LICENSE
9 months ago
LICENSE
README.md
3 months ago
README.md
resume.md
8 months ago
resume.md
README.md
Resolve merge conflicts
Learn why conflicts happen and how to resolve them.

Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.

Who is this for: New developers, new GitHub users, users new to Git, students, managers, teams.
What you'll learn: What merge conflicts are, how you resolve merge conflicts, how to reduce merge conflicts.
What you'll build: We'll work with a short Markdown resume file in this course.
Prerequisites: We recommend taking Introduction to GitHub prior to this course.
How long: This course is three steps long and takes less than 30 minutes to complete.
How to start this course
Above these instructions, right-click Use this template and open the link in a new tab.
In the new tab, follow the prompts to create a new repository.
For owner, choose your personal account or an organization to host the repository.
We recommend creating a public repository—private repositories will use Actions minutes.
After your new repository is created, wait about 20 seconds, then refresh the page. Follow the step-by-step instructions in the new repository's README.
Step 1: Resolve a merge conflict
Step 2: Create your own conflict
Step 3: Merge your pull request
Finish
Get help: Post in our discussion board • Review the GitHub status page

© 2022 GitHub • Code of Conduct • CC-BY-4.0 License

Contributors 4

heiskr Kevin Heis

rsese Robert Sese

emilyistoofunky Emily Gould

sinsukehlab
Footer
© 2022 GitHub, Inc.
Footer navigation
Terms
Privacy
Security
Status
Docs
Contact GitHub
Pricing
API
Training
Blog
About

[re1developer471]

Thank you

[re1developer471]

All my accounts link automatically

[re1developer471]

All of my accounts link automatically end to end encryption completely private and highly protected and confidential only I can access