Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another User's Change #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

github-learning-lab[bot]
Copy link

Step 6: Conflicting change

This pull request adds changes to the _data/education.yml file. It's the same file that you just changed in your pull request.

After you merge this pull request, your pull request will have a merge conflict. That's because there will have been changes on two different branches to the same part of the same file.

⌨️ Activity: Approving a pull request

  1. In the pull request status window below, click Add your review
  2. When the pull request review window displays, select Approve and click Submit review

Watch below for my response

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant