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

Refresh Stutter Locks #164

Merged
merged 3 commits into from
Feb 17, 2023
Merged

Refresh Stutter Locks #164

merged 3 commits into from
Feb 17, 2023

Conversation

TWiStErRob
Copy link
Collaborator

git checkout master
git checkout -b stutter_locks
gradlew stutterWriteLocks
git add **/*.lock
git commit -m "Refresh Stutter Locks"

@TWiStErRob
Copy link
Collaborator Author

@szpak can we merge this before the fix for #152? So that testing for newer versions is covered. I'll remove the fail-all change in the PR for #152.

@szpak
Copy link
Contributor

szpak commented Feb 17, 2023

@szpak can we merge this before the fix for #152? So that testing for newer versions is covered. I'll remove the fail-all change in the PR for #152.

Sure, I was thinking about that, but... the warnings. However, as you suggested, they could be removed in the #152 related PR.

@szpak szpak added this pull request to the merge queue Feb 17, 2023
Merged via the queue into gradle-nexus:master with commit b9495cb Feb 17, 2023
@TWiStErRob TWiStErRob deleted the stutter_locks branch February 17, 2023 21:53
@TWiStErRob
Copy link
Collaborator Author

Interesting... I force pushed after you added to merge queue... (it was a clean rebase, but still, should've failed in some way; I wonder which version got merged)

@szpak
Copy link
Contributor

szpak commented Feb 17, 2023

Interesting... I force pushed after you added to merge queue... (it was a clean rebase, but still, should've failed in some way; I wonder which version got merged)

The text after I clicked the "merge when ready" stated that "any new commit will not be taken into account". However, it's still in beta ;).

image

Were there any new commits after that force-push 5 minutes before merge?

@TWiStErRob
Copy link
Collaborator Author

TWiStErRob commented Feb 17, 2023

No changes, it was equivalent to the merge-queue because I just rebased.

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