-
Type:
Suggestion
-
Resolution: Unresolved
-
None
-
Component/s: Pull Request - Cascading Merge, Pull Request - Merge
-
None
-
6
Background
We deal with a lot of merge conflicts and need to make sure not to squash (our default strategy) when we resolve them.
Problem
Currently, when Auto-Merge processes pull requests, it doesn't indicate which merge strategy it's using. This creates uncertainty for developers who then need to:
1. Disable Auto-Merge for the PR
2. Manually set the merge strategy
3. Re-enable Auto-Merge "to be sure"
Proposed Solution
Auto-Merge should add a comment to pull requests indicating which merge strategy it will use (e.g., squash, merge, rebase).
Benefits
- Massive quality of life improvement for developers
- Reduces manual intervention and workflow disruption
- Provides transparency in the merge process
- Eliminates guesswork around merge strategy selection