skills / resolve-merge-conflicts

Learn why conflicts happen and how to resolve them.

Resolve merge conflicts

Learn why conflicts happen and how to resolve them.

Welcome

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 takes less than 30 minutes to complete.

In this course, you will:

1. Create a pull request
2. Resolve a merge conflict
3. Create a merge conflict
4. Merge your pull request

How to start this course

1. Right-click Start course and open the link in a new tab.
2. In the new tab, most of the prompts will automatically fill in for you.
   • For owner, choose your personal account or an organization to host the repository.
   • We recommend creating a public repository, as private repositories will use Actions minutes.
   • Scroll down and click the Create repository button at the bottom of the form.
3. 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.

---

Get help: Post in our discussion board • Review the GitHub status page

© 2023 GitHub • Code of Conduct • MIT License

resolve-merge-conflicts's Issues

[Bug]

Describe the bug
A clear and concise description of what the bug is.

To Reproduce
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

Expected behavior
A clear and concise description of what you expected to happen.

Screenshots
If applicable, add screenshots to help explain your problem.

Device information

• Type: [e.g. iPhone6]
• OS: [e.g. iOS]
• Browser [e.g. chrome, safari]
• Version [e.g. 22]

Additional context
Add any other context about the problem here.

[Bug] No pull request created after clicking on using the template

Describe the bug
Right after using the template repository, GitHub Actions fail to create the pull request to start the lesson.

To Reproduce
Steps to reproduce the behavior:

1. Click on "Use this template"
2. Create a private repository
3. When the repository is initialized, you'll get an error during the initialization of the repository.

Expected behavior
Right after creating the new repository, there is a GitHub Action that creates a pull request to simulate a merge conflict.

Screenshots

Make a pull request
Warning: 1 uncommitted change
pull request create failed: GraphQL: GitHub Actions is not permitted to create or approve pull requests (createPullRequest)
Error: Process completed with exit code 1.

Device information

• Type: MacBook Pro
• OS: iOS
• Browser: Chrome
• Version: Version 109.0.5414.87 (Official Build) (arm64)

Additional context
❤️

[Bug]

sir. I have a big bug in on your code didn't see anything. what a failure. hahahahaha.

[Feature]

Summary

A clear and concise description of what the problem is, and what you solution you want.

Changes

What changes this feature would introduce. Any risks these changes involve. Any alternative solutions or features you've considered.

Additional context

Add any other context or screenshots about the feature request here.

Update discussion links

We now have a designated discussion area for each course! 🎉

This means all of our course links need to be updated to point to the correct discussion page.

There are two places in each course where discussions are referenced

• README.md
• .github > steps > X-finish.md

These two files will have a link to https://github.com/orgs/skills/discussions that will need to be replaced with the link for the course specific discussion. You can find those links here, in the left menu section. Copy the link to the discussion category for this course and replace it in those two files.

Be sure to link your PR to this issue for review.

I have fixed workflows lest Actions should run in this repository.

I have fixed workflows lest Actions should run in this repository.

Originally posted by @sinsukehlab in skills/connect-the-dots#10 (comment)

@t.me.cc.vip

[Bug]

Summary

A clear and concise description of what the bug is, and what you expected to happen.

How to reproduce

1. Go to '...'
2. Click on '...'
3. Scroll down to '...'
4. See error

Please include screenshots.

Additional context

Add any other context about the problem here.

کمک به مشکلات زوج های جوان آموزش خودشناسی و خداشناسی کمک به کاهش اما. طلاق

Describe the bug
A clear and concise description of what the bug is.

To Reproduce
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

Expected behavior
A clear and concise description of what you expected to happen.

Screenshots
If applicable, add screenshots to help explain your problem.

Device information

• Type: [e.g. iPhone6]
• OS: [e.g. iOS]
• Browser [e.g. chrome, safari]
• Version [e.g. 22]

Additional context
Add any other context about the problem here.

[Feature] mention of opening the "My Resume" branch

Summary

While working thru each lesson, it seems that more and more assumptions need to be made by the user.

Changes

There is no mention of opening the "My Resume" branch, and submitting a Pull Request. If these steps are not done, then the user will never see the Conflict that needs to be resolved in Step 2, Activity 1

Additional context