How awkward is it to merge a pull request into two different branches that will later be merged together?

(Yes, I’m still a novice when it comes to the collaborative part of collaborative git systems, no, I’m not planning on continuing this project with GitHub.)

I hate that the state of the internet has led me to this post. Ugh. I can’t even look up GitHub workflows without getting the “Workflow” branded automation.

#git #GitHub #PullRequest

I probably would have spent more time, trying to fix what he's missing, if I'd see the potential of the time spent leading to anything.
But I feel like he doesn't want it to be implemented anyways?
Or is it just that my proposals are that bad, that leaving them open to be updated is pointless, anyways?

#PullRequest #Maintainerhsip #Programming #OpenSource #Contributors

Yes, I had introduced a loop over all ingredients to get an additional information that I had expected to be available in the client already, but had to find out its not.

I pretty much just dug into this code base just as far as needed, but I've no full understanding of the project.
So, maybe there would be a more efficient way to get this information? Or solve the overal problem I had?
I don't know.

#PullRequest #Maintainerhsip #Programming #OpenSource #Contributors

Not sure where exactly the codestyle is bothering him, or what style rules he wants contributors to follow 🤷

I e.g. tried to do the brackets the same style. In the html I'm not exactly sure from what the style should be 🤔

I also don't know how I changed the public API (because he said I didn't update the OpenAPI json): I thought I had just changed the internal PHP variables buildUp, what the javascript has available later? 🧐

#PullRequest #Maintainerhsip #Programming #OpenSource #Contributors

With the styling I had problems getting it styled as the rest, as it either didn't catch the styles correctly, or made the checkboxes/radio buttons not clickable because the visual checkbox and the actual clickable one where deviated from each other in this called bootbox 🫠

Also, the yet existing popup already uses differently styled checkboxes than the rest. Don't know what to make of this now.

#PullRequest #Maintainerhsip #Programming #OpenSource

Oh hey, Bernd has found this Fediverse thread it seems 🤔

Yes, I've not yet delivered a 100% solution with translations, documentation (as the mentioned OpenAPI).
I've tried to bring up a general solution in the direction he wanted and asked if I needed to change anything else.

https://github.com/grocy/grocy/pull/2868

#PullRequest #Maintainerhsip #Programming #OpenSource

Recipe: allow adding full recipe required ingredient amount by 9Lukas5 · Pull Request #2868 · grocy/grocy

As you asked in #2864, I extended the existing popup. This modifies the bootbox on to add recipe ingredients to the shopping list in a way, that button to open bootbox is always enabled popup list...

GitHub

Ok Fedi, do you think this is ok for a second attempt of a PR?
Any recommendations what to change to get on his good side? 👀

https://github.com/grocy/grocy/compare/master...9Lukas5:grocy:feat_recipe-add-option-to-ignore-stock-on-shopping-cart-add

#GitHub #Grocy #OpenSource #PullRequest #OSS #Programming #DuckDuckFedi

#AIagents: "We’re relying on these little companions to validate us and to collaborate with. But it’s not a genuine #collaboration like between humans, it’s one that is completely driven by us, and the #AI is just there for the ride. We can trick it to reinforce our ideas and impulses. And we act through this AI. Some people who have not programmed before, now wield tremendous powers, but all those powers are gone when their subscription hits a rate limit and their little #dæmon goes to sleep.
Then, when we throw up a #PullRequest or issue to someone else, that contribution is the result of this pseudo-collaboration with the machine."
https://lucumr.pocoo.org/2026/1/18/agent-psychosis/
Agent Psychosis: Are We Going Insane?

What’s going on with the AI builder community right now?

Armin Ronacher's Thoughts and Writings