Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Skins :: adjust styles of skin context menus, tooltip, ..." #2357

Merged
merged 1 commit into from
Nov 15, 2019

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Nov 15, 2019

Reverts #2337

I'd rather revert the entire PR and fix the remaining issues (especially on MacOS) in a #2337 clone instead of having to rush things because of the now inconsitent and broken situation (at least in Deere) on MacOS.

@daschuer
Copy link
Member

Oh sorry. I should have read closer.

@daschuer daschuer merged commit b522069 into mixxxdj:master Nov 15, 2019
@ronso0 ronso0 deleted the revert-2337-sidebar-qmenu-styles branch November 15, 2019 18:41
@ronso0
Copy link
Member Author

ronso0 commented Nov 15, 2019

@daschuer What's the easiest way to get the previous branch into a comparable state again, without having to resolve merge conflicts...again?
Simply comparing the old branch to master now gives me "nothing to compare".
Renaming the old branch gives the same result.
Cherry-picking gives me conflicts already with the first commit.
rebase -i and squash all commits?
checkout master, revert to before my first commit, then cherry-pick all commits incl. merge-master?

@daschuer
Copy link
Member

How about that:
git fetch upstream
git reset upstream/master --hard
git revert 6e1abd2
git push -f

(Untested)

You need to open a new PR.
Sorry for all the hassle.

@ronso0
Copy link
Member Author

ronso0 commented Nov 15, 2019

I'll try that.
Nevermind, shizzle happens.

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.

2 participants