search

SimonGoring / neotoma_paper

Repository for the neotoma package paper.
MIT License
3 stars 2 forks source link

I think I just screwed up the repository. #34

Closed SimonGoring closed 9 years ago

SimonGoring commented 9 years ago

Hey @gavinsimpson, I was just trying to update the readme, but I think I pushed a whole bunch of changes from my local machine up to the repository that shouldn't have been included (commit bf7ab85a12b7575d053fcdef84907c8e0a43f82a). Any thoughts on how to revert them? I tried using rebase on my local computer but it's telling me my terminal is dumb.

karthik commented 9 years ago

If Gavin is busy I can do it at 2pm

SimonGoring commented 9 years ago

Thanks.

On Thu, Oct 9, 2014 at 1:06 PM, Karthik Ram notifications@github.com wrote:

If Gavin is busy I can do it at 2pm

— Reply to this email directly or view it on GitHub https://github.com/SimonGoring/neotoma_paper/issues/34#issuecomment-58551763 .

gavinsimpson commented 9 years ago

git revert bf7ab85a12b7575d053fcdef84907c8e0a43f82a should do it. You'll lose the changes you made to README.md so perhaps copy that somewhere outside the repo before you do this. I had to do this last night as I deleted margins.sty from my local repo and pushed it to my fork. Reverting the specific commit that made that change instantly sorted out the problem.

You'll probably need to push your local repo back to the master after you've done the revert too.

gavinsimpson commented 9 years ago

@karthik If you can write to this repo, could you clean up? I don't so I could revert that commit and do a PR but we could cut out the middleman if you can write here? If not, I'm happy to revert and do the PR.

karthik commented 9 years ago

@gavinsimpson Yes I can write to the repo. Latest commit is now at bf7ab85

karthik commented 9 years ago

@SimonGoring Did you need the repo to go to the commit before?

gavinsimpson commented 9 years ago

@karthik Cheers, and yes, bf7ab85 is the offending commit and we want to revert that so we are back at 1ff7634a15656e8211e0dce82a743aae4ef8b8ce

gavinsimpson commented 9 years ago

@karthik I think you've reverted 1ff7634 instead of bf7ab85

karthik commented 9 years ago

oops. I'll fix it after a call.

gavinsimpson commented 9 years ago

No immediate rush; @SimonGoring won't be doing much till the commit gets reverted and I have sorted out my problems rebuilding the documents locally so have finished my clean up but there is not hurry to push that in here yet as long as we don't modify the repo further before we tag it with "submission" (or similar).

Cheers @karthik