Accidentally merged untested code in the stable branch, can't find the merge to revert [Answered]
Title explains it. https://github.com/TheBoxyBear/charttools I accidentally merged beta into stable which included nearly 100 commits. I can see other merges that were done in the commit history but not the last one yet the merge did happen and all the files are in the branch.
GitHub
GitHub - TheBoxyBear/charttools: Library for editing Clone Hero son...
Library for editing Clone Hero song files in .NET. Contribute to TheBoxyBear/charttools development by creating an account on GitHub.
22 Replies
Merged using GitHub desktop
silly question probably, but did you push? or only commit?
pushed
Think I found the culprit
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
So the yellow number is the commit id?
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
Just finding the number of commits since is tricky
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
Yeah problem is the merge isn't showing here or in github desktop
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
beta into stable with dozens of files
Nearly 100 commits included
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
My guess is it's the one from reflog
Unknown User•3y ago
Message Not Public
Sign In & Join Server To View
Last one on that branch was months ago
Still in pre-release so tempted to just delete stable, make beta the main branch and quickly bugfix
Would still contain a bunch of unfinished classes
Or could delete the classes and references. There's not much crossreferencing with what used to be there anyway
Just how can I make sure the future merge from beta to stable will cause conflicts so I have the option to keep the files missing from stable6
does a log adog help identify your commits?
git log --all --decorate --oneline --graphToo late now, already went along reworking the branch into a sort of lts
Doing testing
Git blame could be a solid choice or a possibility for this case? @Mayor McCheese
And by "solid choice" I mean that it'll do the job just fine
Why have they allowed the merging ability in the first place?
I don't have access to ever merge directly into the main branch
Code review is done always and I have to create a PR.
I own the repo
✅ This post has been marked as answered!