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

Upgrade Yaru++ to the new version 4.0 #24125

Closed
wants to merge 0 commits into from
Closed

Upgrade Yaru++ to the new version 4.0 #24125

wants to merge 0 commits into from

Conversation

gusbemacbe
Copy link
Contributor

Hello!

Days ago I have released a new version at the releases list (I refer to the tag), so I upgrade Void's package yaru-plus.

Observe that there's a problem, Yaru++ Minimal requires original Yaru to be installed, I am not sure that it is correct to apply depends on the template.

cc: @DarthWound, @k4leg and @pullmoll.

@pullmoll
Copy link
Member

Please squash to one commit. AFAICT the depends="yaru" is ok.

@gusbemacbe
Copy link
Contributor Author

@pullmoll

No, I made a mistake.

@gusbemacbe
Copy link
Contributor Author

@pullmoll

Solved. I reseted harded and pushed with force.

@pullmoll
Copy link
Member

You still have two commits. git rebase -i origin/master and put an f (fixup) before the 2nd line, save and let git fixup the 1st commit, then do a git push -f.

@gusbemacbe
Copy link
Contributor Author

@pullmoll,

git rebase -i origin/master or git rebase -i origin/yaru-plus?

@pullmoll
Copy link
Member

pullmoll commented Aug 23, 2020

If your fork is clean you can (and should) rebase against origin/master. There should be only 2 entries and you can squash them and edit the message, or fixup the first with the second by prepending f(ixup) before 2nd the entry.

@gusbemacbe gusbemacbe closed this Aug 23, 2020
@gusbemacbe
Copy link
Contributor Author

I did something wrong, @pullmoll.

@gusbemacbe
Copy link
Contributor Author

@pullmoll

At branch yaru-plus, I did like:

  1. git rebase -i origin/master
  2. I modified:
pick 12acf3e952 yaru-plus: update to 4.0.
fixup f385cc38b1 yaru-plus: update to 4.0.
  1. git push -f origin HEAD:yaru-plus

Did I do something incorrectly?

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants