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

Post comment when codeflow PR cannot be updated due to conflict #4182

Open
premun opened this issue Nov 25, 2024 · 0 comments
Open

Post comment when codeflow PR cannot be updated due to conflict #4182

premun opened this issue Nov 25, 2024 · 0 comments

Comments

@premun
Copy link
Member

premun commented Nov 25, 2024

Context

In #4162 and #4163, we added a detection of when a conflict exists on the branch we're flowing the code to (e.g. the already existing PR branch).
In that case, we're throwing a new kind of exception (ConflictInPrBranchException). However, PCS does not understand this yet.

Goal

Catch this exception in the right place (somewhere in PullRequestUpdater?) and post a comment on the PR that code flow is stopped due to an update.
Potentially also pause the updates to the PR by noting down together with the PR-tracking metadata in Redis that this is the case and stop updating the PR again.
Only wait for it to get closed to stop tracking it.

Alternatively, we could try future updates again (in case the conflict disappears) and resume updating but not sure this is really needed.

@premun premun moved this to Ready in .NET Unified Build Dec 2, 2024
@premun premun changed the title Post comment when codeflow PR cannot be update due to conflict Post comment when codeflow PR cannot be updated due to conflict Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Ready
Development

No branches or pull requests

1 participant