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.

Sign up for GitHub

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

Jump to bottom

Git history inconsistencies #60

Closed
pshriwise opened this issue Jul 30, 2019 · 5 comments
Closed

Git history inconsistencies #60

pshriwise opened this issue Jul 30, 2019 · 5 comments
Labels
project

Comments

@pshriwise
Copy link
Member

I should have looked at #53 more carefully. There is something quite wrong with the history of our modular branch in this repo. The commits PRs #41, #42, #43, and #50 are all missing in the history of that branch and as a result they are no longer in the master branch of this repo either. I'm not sure at what point this happened and I'm not sure what to do about it, but I'll try to come up with a suggestion shortly.
@pshriwise pshriwise changed the title Git history issues Git history is inconsistent Jul 30, 2019
@pshriwise pshriwise changed the title Git history is inconsistent Git history inconsistencies Jul 30, 2019
@pshriwise
Copy link
Member Author

Perhaps we can just create new PRs and merge them into master? Ideally it would all happen in one PR I suppose.

@gonuke
Copy link
Member

gonuke commented Jul 30, 2019

Yikes! This is probably my fault. I might have force-pushed the modular branch at some point to get things moving??? Although I'm not sure I remember doing that...?

@pshriwise
Copy link
Member Author

It could’ve been anyone, really. It may have already been that way when you created #53. Regardless of how it happened, we thankfully have the PR history here to identify what changes need to be re-added.

@pshriwise
Copy link
Member Author

I'm leaning toward adding those PRs one-by-one, so their separate purposes are in separate PRs still. (Also, being frank, it's a little easier)

This was referenced Jul 31, 2019
Merged
Closed
@pshriwise pshriwise mentioned this issue Aug 28, 2019
Merged
@pshriwise
Copy link
Member Author

Looking back at the PR history, these have all been addressed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
project
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@gonuke @pshriwise