Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
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.

Appearance settings

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

ironhack-labs / lab-resolving-git-conflicts Public

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

Code
Issues
Pull requests 14
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Resolved merge conflict#7

Open

martijnooo wants to merge 5 commits intoironhack-labs:mainironhack-labs/lab-resolving-git-conflicts:mainfrom

martijnooo:test-branch-for-conflictsmartijnooo/lab-resolving-git-conflicts:test-branch-for-conflictsCopy head branch name to clipboard

Conversation Commits5 (5)Checks Files changed

Open

Resolved merge conflict#7
martijnooo wants to merge 5 commits intoironhack-labs:mainfrom
martijnooo:test-branch-for-conflicts

Commits

Commits on Jan 22, 2025

Only a small adjustment
martijnooo
committed

Commits on Jan 24, 2025

This is the default file for testing conflicts
martijnooo
committed
First change to test file
martijnooo
committed
This is a file with different changes to create conflicts
martijnooo
committed
This is the resolved file
martijnooo
committed

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.