Skip to content

Resolved merge conflict #7

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

martijnooo
Copy link

@martijnooo martijnooo commented Jan 24, 2025

@Mariam - this was just for testing. The first pull request is the one from the assignment.

Created a default file in main and made two different adjustments on two branches (main & test-branch-for-conflicts) to force a merge conflict on pull request from main.

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