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.

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

fix CIP-0040 table omissions (try 2) #286

Closed
wants to merge 16 commits into from

Conversation

rphair
Copy link
Collaborator

@rphair rphair commented Jul 2, 2022

Trying again to fix something accidentally left out of #216 (comment) without the 18 month commit history as seen in #285.

@rphair
Copy link
Collaborator Author

rphair commented Jul 2, 2022

Well, here we go again. I'm very sorry but I have tried my best to create this PR without the enormous redundant commit history. Nothing I do will squash it. I have even fixed this problem before but the solution as I understood it isn't working in this case.

Sorry about the mess. I would appreciate some advice how to avoid this but if so then please be specific and as literal as possible. Otherwise I will work it out on my own eventually.

It's my understanding that the local branch I'm working with has been fully caught up with master upstream. My fork is also showing all the latest changes. I need to understand why this is happening to get fully functional here. 😕

@rphair
Copy link
Collaborator Author

rphair commented Jul 2, 2022

this was necessary to manhandle my fork back into place (I will keep going over this until I understand exactly why it was required in my case):

git reset --hard upstream/master
git push --force

@rphair rphair closed this Jul 2, 2022
@rphair rphair deleted the cip-0040-reviewed-table-try2 branch July 2, 2022 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants