search

googleapis / release-please

generate release PRs based on the conventionalcommits.org spec
https://www.conventionalcommits.org
Apache License 2.0
4.9k stars 368 forks source link

Consider inserting fillers between lines in manifest files #1502

Open dazuma opened 2 years ago

dazuma commented 2 years ago

We have a large monorepo that uses manifests. The manifest file is of course a JSON file that includes a line for each package, that is updated whenever a new version of the package is released. We frequently release multiple packages in succession (in separate PRs). If two of those packages are adjacent in the manifest file, this causes git conflicts since the PRs independently try to modify adjacent lines in the same file.

Our current workaround has been to insert filler lines in our manifest file, in the form of a "fake" package following each real package, to separate out the real packages and ensure that no two occupy adjacent lines in the file. This seems to be working for us for now, but maybe we can consider building a solution into the tool itself.

shinebayar-g commented 1 year ago

Thanks for the nice workaround! "separate-pull-requests": true is a really nice feature. Instead of having to require a filler line, if release-please could rebase / merge latest upstream changes to the existing PR that would be awesome.

shinebayar-g commented 1 year ago

Got a workaround working without needing to insert filler lines. See https://github.com/googleapis/release-please/issues/1870#issuecomment-1748390833