AnswerOverflow
C#
C#

help

Join

Root Question Message

TheBoxyBear
TheBoxyBear8/31/2022
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.
TheBoxyBear
TheBoxyBear8/31/2022
Merged using GitHub desktop
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
pushed
TheBoxyBear
TheBoxyBear8/31/2022
Think I found the culprit
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
So the yellow number is the commit id?
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
Just finding the number of commits since is tricky
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
Yeah problem is the merge isn't showing here or in github desktop
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
beta into stable with dozens of files
TheBoxyBear
TheBoxyBear8/31/2022
Nearly 100 commits included
Message Not Public

Sign In and Join Server To See

8/31/2022
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
My guess is it's the one from reflog
Message Not Public

Sign In and Join Server To See

8/31/2022
TheBoxyBear
TheBoxyBear8/31/2022
Last one on that branch was months ago
TheBoxyBear
TheBoxyBear8/31/2022
Still in pre-release so tempted to just delete stable, make beta the main branch and quickly bugfix
TheBoxyBear
TheBoxyBear8/31/2022
Would still contain a bunch of unfinished classes
TheBoxyBear
TheBoxyBear8/31/2022
Or could delete the classes and references. There's not much crossreferencing with what used to be there anyway
TheBoxyBear
TheBoxyBear8/31/2022
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
Mayor McCheese
Mayor McCheese8/31/2022
does a log adog help identify your commits? git log --all --decorate --oneline --graph
TheBoxyBear
TheBoxyBear8/31/2022
Too late now, already went along reworking the branch into a sort of lts
TheBoxyBear
TheBoxyBear8/31/2022
Doing testing
Instinct
Instinct8/31/2022
Git blame could be a solid choice or a possibility for this case? @347434717022257162
And by "solid choice" I mean that it'll do the job just fine
KidKai25
KidKai258/31/2022
Why have they allowed the merging ability in the first place?
KidKai25
KidKai258/31/2022
I don't have access to ever merge directly into the main branch
KidKai25
KidKai258/31/2022
Code review is done always and I have to create a PR.
TheBoxyBear
TheBoxyBear8/31/2022
I own the repo
ContactFrequently Asked QuestionsJoin The DiscordBugs & Feature RequestsTerms & Privacy