Skip to content

Revert "Supplement for scs-0004: regulations for achieving certification"#894

Closed
fkr wants to merge 0 commit intomainfrom
revert-881-feat/scs-0004-w1
Closed

Revert "Supplement for scs-0004: regulations for achieving certification"#894
fkr wants to merge 0 commit intomainfrom
revert-881-feat/scs-0004-w1

Conversation

@fkr
Copy link
Copy Markdown
Member

@fkr fkr commented Mar 25, 2025

Reverts #881 - this was accidently merged.

@fkr fkr requested review from garloff and mbuechse March 25, 2025 13:11
@mbuechse
Copy link
Copy Markdown
Contributor

mbuechse commented Mar 25, 2025

@fkr thanks for creating the PR. I think we only need to revert one commit (it was a squash merge), and we need to recreate the branch that has been deleted when the other PR got merged correction: it has been restored already

@mbuechse mbuechse force-pushed the revert-881-feat/scs-0004-w1 branch from 8cb4a0e to c8589d8 Compare March 25, 2025 13:34
@mbuechse
Copy link
Copy Markdown
Contributor

So now I have broken this PR because I was under the impression that the other PR was a squash merge. Which is not the case, making the blunder even worse. @garloff can you please disable the protection on the main branch, reset HEAD to before the change, force-push, and then restore the branch protection on the main branch?

@mbuechse mbuechse closed this Mar 25, 2025
@mbuechse mbuechse force-pushed the revert-881-feat/scs-0004-w1 branch from c8589d8 to 2267a49 Compare March 25, 2025 13:39
@garloff
Copy link
Copy Markdown
Member

garloff commented Mar 25, 2025

OK, so you want me to do:

git reset 090ab004f817c19c3b6ddb990f850fb18965db03
git push --force-with-lease

and of course to the necessary adjustments on github to temporarily remove the branch protection?

@mbuechse
Copy link
Copy Markdown
Contributor

@garloff Yes, precisely.

@garloff
Copy link
Copy Markdown
Member

garloff commented Mar 25, 2025

Done:

garloff@nas3(//):/casa/src/SCS/standards [0]$ git checkout main; git pull; git log | head -n3
Already on 'main'
Your branch is up to date with 'origin/main'.
Already up to date.
commit 090ab004f817c19c3b6ddb990f850fb18965db03
Author: Matej Feder <feder.mato@gmail.com>
Date:   Mon Mar 24 08:09:19 2025 +0100

@garloff
Copy link
Copy Markdown
Member

garloff commented Mar 25, 2025

Just in case: I have a local branch with the commits from #881.

@mbuechse
Copy link
Copy Markdown
Contributor

The new PR is now
#895
and it's a draft just be sure

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.

3 participants