Skip to content

✨ Avoid deadlocks in codeflow dependency file merges #5176

@dkurepa

Description

@dkurepa

Currently, if we reach a "conflicting" case in a codeflow subscription when the source repo is adding dependency Foo and the target is removing it (or vice versa) we throw an exception, and never push a commit or anything like that. This can lead to a PR not being created at all, which is undesirable behavior.

Goal

  • Don't throw an exception in this situation, except what the target branch has
  • Ideally put a comment in the PR so the PR reviewers are aware that this happened

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type
No fields configured for issues without a type.

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions