Skip to content

Conversation

@frogcloak
Copy link

Finished problem 5, added in the updated README.md, and P5_merge and P5_remote. A few file changes were added in the same commits instead of separately as exactly outlined in the homework instruction (e.g. P5_merge was added and merge conflict was resolved in the same commit).

@DavidAssaraf106
Copy link

Problem 5b:

Correctly made branches
Modify README.md
Screenshot of merge conflict
Merge conflict resolved
Practice with git revert
Score: 25/25

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.

2 participants