Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XCM ROUTER: Resolve release conflicts #168

Closed
dudo50 opened this issue Feb 29, 2024 · 2 comments
Closed

XCM ROUTER: Resolve release conflicts #168

dudo50 opened this issue Feb 29, 2024 · 2 comments
Labels
bug Something isn't working maintenance work

Comments

@dudo50
Copy link
Contributor

dudo50 commented Feb 29, 2024

Split release please manifest to 2 independent files to resolve conflicts between merging new versions.

This requires:

  • Updating code
@dudo50 dudo50 added bug Something isn't working maintenance work labels Feb 29, 2024
@michaeldev5
Copy link
Collaborator

Related issue that might help resolve the problem: googleapis/release-please#1870 (comment)

@dudo50
Copy link
Contributor Author

dudo50 commented May 20, 2024

Resolved by further research:

  1. The Autorelease pending tag must be removed and the latest Release please CI must be rerun.
    The release please then regenerates release PR. It will no longer contain conflicts then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working maintenance work
Projects
None yet
Development

No branches or pull requests

2 participants