Skip to content

feat: comment on auto-merge problems#603

Open
AlexanderLanin wants to merge 5 commits intoeclipse-csi:mainfrom
AlexanderLanin:merge_prob
Open

feat: comment on auto-merge problems#603
AlexanderLanin wants to merge 5 commits intoeclipse-csi:mainfrom
AlexanderLanin:merge_prob

Conversation

@AlexanderLanin
Copy link
Contributor

@AlexanderLanin AlexanderLanin commented Feb 28, 2026

closes #602

⚠️ I was not able to test any of it. This is just guesswork.

@AlexanderLanin AlexanderLanin marked this pull request as ready for review February 28, 2026 21:54
Copilot AI review requested due to automatic review settings February 28, 2026 21:54
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds user-facing feedback when /otterdog merge cannot proceed, by collecting eligibility problems and posting them as a PR comment.

Changes:

  • Introduces a new “automerge problems” comment template to list reasons auto-merge is blocked.
  • Refactors merge pre-checks to return a list of blocking reasons and post them as a PR comment.
  • Adds PullRequestModel.automerge_problems() and re-implements can_be_automerged() in terms of it.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File Description
otterdog/webapp/templates/comment/wrong_user_merge_comment.txt Removes the old single-purpose warning template.
otterdog/webapp/templates/comment/automerge_problems.txt Adds a new template intended to list auto-merge blocking reasons.
otterdog/webapp/tasks/merge_pull_request.py Collects auto-merge eligibility problems and posts them to the PR when merge is skipped.
otterdog/webapp/db/models.py Adds an API to enumerate auto-merge blocking reasons and updates eligibility logic.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated no new comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@AlexanderLanin AlexanderLanin marked this pull request as ready for review March 1, 2026 23:04
@AlexanderLanin
Copy link
Contributor Author

If merged, please squash as the commits are meaningless.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@netomi
Copy link
Member

netomi commented Mar 3, 2026

@AlexanderLanin only squash or rebase is enabled for merging PRs and I usually squash commits from a PR when merging.

kairoaraujo
kairoaraujo previously approved these changes Mar 4, 2026
@netomi
Copy link
Member

netomi commented Mar 4, 2026

could you add a changelog entry?

If I edit the PR myself, I cant merge afterwards.

@AlexanderLanin
Copy link
Contributor Author

@netomi done. I assumed that would be 1.3.0 then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feature request: comment info on merge attempt

4 participants