ilja :pumpkin_owo: on Nostr: one annoying thing is the CHANGELOG.md bc it always creates merge conflicts, while ...
one annoying thing is the CHANGELOG.md bc it always creates merge conflicts, while the conflicts are such trivial things..
I wonder if it's possible to fix this, maybe by doing some automated steps when merging to a branch
maybe have a folder somewhere "CHANGELOG", and then you can add files there with the needed info for your PR. And then when merging to the develop branch, some runner job builds it onto the CHANGELOG.md and removes the files again. I think this could work and be rather trivial, no?
I wonder if it's possible to fix this, maybe by doing some automated steps when merging to a branch
maybe have a folder somewhere "CHANGELOG", and then you can add files there with the needed info for your PR. And then when merging to the develop branch, some runner job builds it onto the CHANGELOG.md and removes the files again.
I think this could work and be rather trivial, no?