Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Revert "remove repetitive words (#35434)"#35436

Merged
steviez merged 1 commit intosolana-labs:masterfrom
steviez:rv_556a74
Mar 9, 2024
Merged

Revert "remove repetitive words (#35434)"#35436
steviez merged 1 commit intosolana-labs:masterfrom
steviez:rv_556a74

Conversation

@steviez
Copy link
Copy Markdown
Contributor

@steviez steviez commented Mar 9, 2024

Problem

I completely spaced and merged #35434; not realizing that I was operating on the solana-labs repo and NOT agave.

Summary of Changes

This reverts commit 556a749.

@steviez
Copy link
Copy Markdown
Contributor Author

steviez commented Mar 9, 2024

Kudos to @CriesofCarrots for quickly catching my screwup. Chatting with her, there are seemingly two options:

  1. Merge this PR to revert remove repetitive words #35434 and leave the source code contents (but not the git history) in the same state
  2. Force push to the repo with that commit reverted which would also make the git history as if my errant commit never occurred

I think I heard that we have been doing manual/semi-automated cherry-picks, so 1. would seemingly do the trick. However, if we decided that we wanted to do option 2., then force pushing to drop two commits is seemingly no worse than force pushing to drop one commit.

With that being said, I'm going to push this PR as-is despite the red on CI; not sure why this PR wasn't automatically closed but that is another discussion. If we decide to go option 2., we'll have to find someone who has force push powers (or maybe someone will have to flip the setting on real quick, do it, and then re-disable it)

CC @yihau @willhickey - Apologies in advance for any headache this causes

@steviez steviez merged commit e81ecfb into solana-labs:master Mar 9, 2024
@steviez steviez deleted the rv_556a74 branch March 9, 2024 05:36
stevenbooke pushed a commit to stevenbooke/solana that referenced this pull request Mar 18, 2024
palinko91 pushed a commit to palinko91/solana that referenced this pull request May 7, 2024
palinko91 pushed a commit to palinko91/solana that referenced this pull request May 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants