[SOLVED] Important - Human mistake in the main branch

[LoganTann]

Problem is now solved.

---

Hello @materializecss/members-write-access

I accidentally clicked on this button, believing it would sync this repo to my fork :

But it synced the original repo with this repo. Over 200 commits were reverted, I'm actually contacting github's support to revert my action.

Really sorry for the inconvenience !

[LoganTann]

Thanks to the PR history, I could restore the code (see branch v1.1-dev-restore)

I'm still awaiting github's support response to properly undo my action in main.

[DanielRuf]

I guess nothing bad happened. This just pulls the missing commits from the original project. No history is lost if I remember correctly.

Let me double-check this.

[DanielRuf]

That is interesting. So GitHub really drops our commits then. They should probably add a warning or similar.

I think we can recover from the last CI build using the SHA hash and reflog. I will test this later.

[DanielRuf]

That is interesting. So GitHub really drops our commits then. They should probably add a warning or similar.

I think we can recover from the last CI build using the SHA hash and reflog. I will test this later.

[DanielRuf]

Should be resolved now. I did these steps:

# clone a fresh copy
git clone [email protected]:materializecss/materialize.git
# go into folder
cd materialize
# checkout main branch, was already the case
git checkout main
# rename / move main branch to main-backup
git branch -m main-backup
# switch to commit of last merge request
# 0006c36a Merge pull request #283 from ajoygp/button-documentation-updates
git checkout 0006c36aaaa3d747e17e6eb8f39a11f4a5d45261
# create new main branch from this commit
git checkout -b main
# force-push to remote main branch
git push -u -f origin main

[DanielRuf]

• checked branches
• deleted v1.1-dev-restore
• pulled latest commit from the upstream repo into ours (in a new main-new branch)
• created a new PR: Merge upstream changes #286

This includes the upstream changes so the notice should be gone then.

Used commands:

git remote add upstream [email protected]:Dogfalo/materialize.git
git fetch upstream
git merge upstream/v1-dev --no-ff
git add jade/_footer.html
git commit -m 'Merge upstream changes'
git rm jade/_footer.html
git commit -m 'Remove file after upstream merge'
git branch -m main-new
gp -u origin main-new

PS: will rename main-new to ùpstream-changes` now.

git branch -m upstream-changes
# change message to "chore: remove file after upstream merge"
git commit --amend
gp -u -f origin upstream-changes

[DanielRuf]

Feel free to merge #287

Awesome that you have informed us, highly appreciated.
No worries, everything is fine and Git is very robust in terms of disaster recovery. As long as garbage collection has not kicked in and all references / commits still exist, we can always rollback like that without problems =)

[LoganTann]

I just merged #287. Thanks a lot for the support Daniel, it's very kind!

[DanielRuf]

I have added a branch protection rule for the main branch just to be sure that this can not happen so easily anymore and requires a pull request.

...

I hope this is ok. I have added the same rule for the other two branches (v2-dev, gh-pages) too.
Update: I have revised the settings for the gh-pages branch since we need the commits from the bots. Only added a branch protection rule for that without a PR requirement. This should prevent the deletion of the branch at least.

cc @materializecss/members @materializecss/members-write-access @materializecss/maintainers

Besides that, have a great weekend everyone and keep up the great work!

[Smankusors]

ou, nice. Thanks for the quickly solving it 🎉