search

CHME5137 / github-assignment

A first assignment
0 stars 30 forks source link

please add me to the list #19

Closed Jiazhen1994 closed 6 years ago

Jiazhen1994 commented 6 years ago

there are two files and one of them is in the wrong format. I tried to remove the wrong one but failed.

rwest commented 6 years ago

It looks like things were OK after your second commit - c1ce14ac6812aef0095a96e4d12678c8f314f31d - but that your third commit deleted the file. (Then your fourth commit replaced it with a new README.md with the wrong content) Your options are 1) reset your master to when things were good (git reset --hard c1ce14a) and then force push it to github (git push --force). This will pretend that the last two commits never happened.

or

2) revert the last two commits (git revert 7f98e2e then git revert e4c54f1) and then push it to github (git push). This will make two new commits that undo the previous two commits.

rwest commented 6 years ago

If you look at the "Files changed" tab near the top of this pull request (or go here: https://github.com/CHME5137/github-assignment/pull/19/files ) you'll see a diff showing that you have changed every single line in the file. Perhaps just something simple like the line ending has changed. But it makes merging it difficult.

Could you try one of the methods I suggested above, to get back to c1ce14ac6812aef0095a96e4d12678c8f314f31d ?

rwest commented 6 years ago

Rebased and merged. Closing request