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

font-cozette: update to 1.23.2. #49199

Merged
merged 1 commit into from
Mar 10, 2024
Merged

font-cozette: update to 1.23.2. #49199

merged 1 commit into from
Mar 10, 2024

Conversation

thoughtpatterns
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc)
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64-glibc
    • armv6l-glibc

Note: new to this and accidentally closed previous PR when squashing commits. Sorry for that; this one I tested more thoroughly and fixed an upstream bug, so no revisions should be needed.

@thoughtpatterns
Copy link
Contributor Author

what could i do here to get it submitted? i dont want to mess up and push like last time. i tried git rebase --root -i to squash but that gave me lots of errors during the interactive rebase. thanks.

@classabbyamp
Copy link
Member

git rebase -i master, then change the last commit from pick to fixup

@thoughtpatterns
Copy link
Contributor Author

i've done this now and have one commit locally. should i force push now? trying to push normally requires me to pull which seems to pull the second commit. thanks.

@classabbyamp
Copy link
Member

git push -f

@thoughtpatterns
Copy link
Contributor Author

done, and thanks. issue was trying to rebase the entire fucking repository last time, this worked much better and ill keep it in mind for next time. appreciate all the help!

@classabbyamp classabbyamp merged commit 37d5d04 into void-linux:master Mar 10, 2024
8 checks passed
@thoughtpatterns thoughtpatterns deleted the font-cozette branch March 10, 2024 01:39
@thoughtpatterns thoughtpatterns restored the font-cozette branch March 10, 2024 01:39
@thoughtpatterns thoughtpatterns deleted the font-cozette branch March 10, 2024 01:39
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