search

livecomsjournal / livecomsjournal.github.io

Content for policy/instructional pages of the Living Journal of Computational Molecular Science (LiveCoMS)
https://livecomsjournal.github.io
6 stars 15 forks source link

Siderius review #128

Closed dwsideriusNIST closed 6 years ago

dwsideriusNIST commented 6 years ago

For some reason, this wants to merge 68 commits into the bylaws branch. That is NOT what I intended.

mrshirts commented 6 years ago

Hmm. Maybe try doing a diff on your local branch to isolate the changes you want, creating a new branch, resetting that new branch to the head of origin/bylaws, and the reimplementing the changes.

https://stackoverflow.com/questions/1628088/reset-local-repository-branch-to-be-just-like-remote-repository-head

On Fri, Dec 1, 2017 at 7:48 AM, Daniel W. Siderius <notifications@github.com

wrote:

Closed #128 https://github.com/livecomsjournal/livecomsjournal.github.io/pull/128.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/livecomsjournal/livecomsjournal.github.io/pull/128#event-1367772487, or mute the thread https://github.com/notifications/unsubscribe-auth/AEE31OtyAcPNCe1G3x5s0vXBm1-swLGxks5s8BGhgaJpZM4QybqO .

davidlmobley commented 6 years ago

I think what's going on here is that you've updated to master (or based your branch off of master) and Michael's bylaws branch has not. So your PR (if you reopen it) would (a) update his branch to master AND incorporate your changes to bylaws. So this might be a good thing, otherwise @mrshirts will have to do it later before merging his. :)

dwsideriusNIST commented 6 years ago

It was some variant of that. I reverted to a clean copy of bylaws, then redid my changes in PR #129