search

ARU-Bioinf-ISE / forking_exercise

Repo to practice fork and pull requests
The Unlicense
0 stars 9 forks source link

This adds Batman to the dictionary. #18

Closed MMunglah closed 4 years ago

MMunglah commented 4 years ago

Requesting permission to go forward with the merge?

MMunglah commented 4 years ago

I have resolved the conflicts in regards to pull request #18 . Requesting permission to merge and to close issue #17

osmart commented 4 years ago

I have resolved the conflicts in regards to pull request #18 . Requesting permission to merge and to close issue #17

Thanks for the corrections I was about to do them myself. The corrections are not conflicts though it would be possible for you to deal with the conflicts by

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-an-upstream-repository-into-your-fork

But this is advanced stuff - so I will deal with the conflicts - I have made a video of me doing this that I will show to the class tomorrow (9th December).