Skip to content

Lab 3 - Pull request exercise#134

Open
JoelMcleodAtikemah wants to merge 11 commits into
mlip-cmu:mainfrom
JoelMcleodAtikemah:pull-request
Open

Lab 3 - Pull request exercise#134
JoelMcleodAtikemah wants to merge 11 commits into
mlip-cmu:mainfrom
JoelMcleodAtikemah:pull-request

Conversation

@JoelMcleodAtikemah

Copy link
Copy Markdown

Making changes to documents to show pull request in lab 3

@JoelMcleodAtikemah

Copy link
Copy Markdown
Author

This pull request demonstrates creating and resolving a merge conflict in README.md for Lab 3.
Conflicting changes were introduced on separate branches, manually resolved, and the final version was committed and rebased.
The commit history shows the full conflict-resolution workflow.

Firstname Lastname added 2 commits February 6, 2026 15:23
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