Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

gudstrand / merge-conflict Public

Notifications You must be signed in to change notification settings
Fork 0
Star 0

Code
Issues 1
Pull requests 4
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Create Your Own Conflict#3

Open

github-learning-lab[bot] wants to merge 2 commits intomastergudstrand/merge-conflict:masterfrom add-educationgudstrand/merge-conflict:add-educationCopy head branch name to clipboard

+3-3

Conversation Commits2 (2)Checks Files changed

Commits

Commits on Feb 23, 2018

Empty commit to allow PR to be created
hollenberry
committed
Adding spaces for easy edit in PR files changed
hollenberry
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.