Skip to content

Update merge method on main branches in bulldozer.yml - #5

Merged
phuongfi91 merged 1 commit into
mainfrom
feat/phuongfi91/bulldozer-config
Aug 26, 2026
Merged

phuongfi91 merged 1 commit into
mainfrom
feat/phuongfi91/bulldozer-config

Conversation

@phuongfi91

Copy link
Copy Markdown
Contributor

No description provided.

Signed-off-by: Phuong Nguyen <7949163+phuongfi91@users.noreply.github.com>
Copilot AI lite review requested due to automatic review settings August 26, 2026 13:56
@phuongfi91
phuongfi91 merged commit 0328642 into main Aug 26, 2026
1 check passed
@phuongfi91
phuongfi91 deleted the feat/phuongfi91/bulldozer-config branch August 26, 2026 13:57

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the Bulldozer configuration so that pull requests targeting main/master use the squash merge method (instead of a dedicated merge rule for those branches).

Changes:

  • Expanded the merge.merge_method squash trigger to include main and master.
  • Removed the separate merge.merge_method rule that previously used method: merge for main/master.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@qodo-code-review

Copy link
Copy Markdown

PR Summary by Qodo

Use squash merges for all primary branches

⚙️ Configuration changes 🕐 Less than 5 minutes

Grey Divider

AI Description

• Applies squash merging to dev, develop, main, and master branches.
• Removes the separate merge-commit rule for main and master.
High-Level Assessment

The consolidated squash rule is the clearest approach because all primary branches now share one merge policy. Retaining separate branch rules was considered unnecessary once their merge methods became identical.

Files changed (1) +1 / -5

Other (1) +1 / -5
bulldozer.ymlStandardize primary branches on squash merging +1/-5

Standardize primary branches on squash merging

• Extends the squash merge trigger to main and master. Removes their previous merge-commit configuration so dev, develop, main, and master follow one consistent policy.

bulldozer.yml

@qodo-code-review

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can start a comment with 'qodo' or '@qodo' to chat about any finding

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

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.

2 participants