Revert "Supplement for scs-0004: regulations for achieving certification"#894
Revert "Supplement for scs-0004: regulations for achieving certification"#894
Conversation
|
@fkr thanks for creating the PR. I think we only need to revert one commit (it was a squash merge), |
8cb4a0e to
c8589d8
Compare
|
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? |
c8589d8 to
2267a49
Compare
|
OK, so you want me to do: git reset 090ab004f817c19c3b6ddb990f850fb18965db03
git push --force-with-leaseand of course to the necessary adjustments on github to temporarily remove the branch protection? |
|
@garloff Yes, precisely. |
|
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 |
|
Just in case: I have a local branch with the commits from #881. |
|
The new PR is now |
Reverts #881 - this was accidently merged.