googleapis / googleapis/release-please

Merge conflicts for concurrent release PRs in monorepo setting

Open
#1,870 9 comments 16 reactions 1 assignee Claimed by @chingor13 View on GitHub
priority: p3 type: question
Dominant language
TypeScript
Stars
7.5k
Forks
588
Avg merge
12h 16m
Merged PRs (30d)
7

Description

Hi all,

we are evaluating release-please with the manifest approach in a monorepo setting. If we have release PRs open for two or more packages / components in parallel, merging one of them creates a merge conflict for the others because of conflicting changes in the `.release-please-manifest.json` file. What is the recommended workflow to deal with this situation?

Thanks a lot for any comments or pointers to existing repos or documentation in advance.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.