Skip to content
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

Diana feng #225

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Diana feng #225

wants to merge 8 commits into from

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