❓ Question about dealing with current/

[delicate vault]

Basically you are asking: Frenck, could you merge current into next?

[real viper]

The opposite 😅 I'm asking if there's anything smaller that a (Git-fluent) PR author can do so that it becomes a little less work for you

And if the answer is nothing, then either yes, please do it, or there's going to be 1 more conflict next time.

Though cherry-picking in my PR doesn't seem great either - these changes would show up in my PR and make it harder to review the things I'm adding.

[queen jay]

You could make that in a separate PR though

Which in a way sounds like overhead, but a "sync current with next for file X" is a quick merge

And the follow up pr is easier to review

[real viper]

alright, I'll try it this way and we'll see how it works. thanks!

Looks pretty clean: https://github.com/home-assistant/home-assistant.io/pull/44199

[queen jay]

And like said, this is one of the cases where the bot just does a suggestion you can safely ignore 🙂

[real viper]

yep, I can see 🙂 , especially the one about missing linked issue