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

Submitting Homework 1: Exercise with the forked playground #233

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

Conversation

vitoriarlima
Copy link

Note: here in my history of commits there is a commit from another user (Kimon Vogt). That was a mistake. He was using my pc to do his hm because his pc was not working. In my pc terminal we switched from his account to mine. Then, today, the day after, when I picked back my work and pushed to my repo, I had forgotten to switch account again - hence the commit of today ('adding my academic year to read me, c4899d1) has actually been done by me, but from the wrong account (in the terminal). So in the terminal I changed account again, as it can be seen from commit 8265456. Other than that, I think I have followed all the steps in the hm instructions.

@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.

3 participants