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

Componentsjs fix syncbutton #4329

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

JaviVilarroig
Copy link
Contributor

This PR fixes a small issue in the SyncButton component. Long press was nor working properly.

@JaviVilarroig
Copy link
Contributor Author

Ouch it seems that I mixed this PR and the one on g4v controller.
I'm closing it to fix that on my side.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

Please do an interactive rebase to separate the relevant commit from your other branch. git rebase -i upstream/main then delete the lines for the unrelated commits.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

There is no need to make a new PR. Do the rebase then force push this branch.

@JaviVilarroig JaviVilarroig reopened this Sep 27, 2021
@JaviVilarroig
Copy link
Contributor Author

OK. Thanks. I have a tendency to panic very fast with git.

@JaviVilarroig
Copy link
Contributor Author

I did it but nothing has changed.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

Did you git push --force?

@JaviVilarroig
Copy link
Contributor Author

Yep :(

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

@JaviVilarroig
Copy link
Contributor Author

I think I manage :)

@JaviVilarroig
Copy link
Contributor Author

But now I pushed an undesired change in CMakeLists.txt

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

It looks like you picked the wrong commit. Don't panic, the commit you want is still there in your reflog. Run git reflog to find that one commit you want and copy its hash. Then:

git reset --hard upstream/main
git cherry-pick HASH_OF_THE_COMMIT

@Be-ing
Copy link
Contributor

Be-ing commented Sep 27, 2021

Thanks!

pre-commit issues are unrelated.

@Be-ing Be-ing merged commit 8edf18d into mixxxdj:main Sep 27, 2021
@JaviVilarroig
Copy link
Contributor Author

Thanks to you, my friend.

I will end learning git :)

@JaviVilarroig JaviVilarroig deleted the componentsjs_fix_syncbutton branch November 7, 2021 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants