search

vifino / vifino-overlay

My personal overlay for Gentoo. Contains openrazer ebuilds and friends mostly.
MIT License
10 stars 4 forks source link

polychromatic update #25

Closed ppfeufer closed 4 years ago

ppfeufer commented 4 years ago

app-misc/polychromatic updated to pull in dev-python/distro as dependency as mentioned in #24

vifino commented 4 years ago

Hey, thanks for the update! By the way, you should synchronise your fork with my master, it has diverging commits which clutter the PR. I'll squash and merge it, which'll end up with the same two files changed.

ppfeufer commented 4 years ago

I did sync with your master » https://github.com/ppfeufer/vifino-overlay/commit/050bd0d232ee05bc1ea7be13ea1885d1af225e8b

Don't ask me what actually went wrong there.

vifino commented 4 years ago

That's a new merge commit, which is not in my branch, so while it has the same content, it has a different history. Git makes things hard. :) I think the easiest is to force push my branch to your branch, or delete your fork and refork, if you prefer it that way.

ppfeufer commented 4 years ago

Ya, the latter is probably what I do next time, since GitHub doesn't have a propper way to keep forks in sync ...