Auto-rebase PRs older than 40 commits compared to main #30643
Conversation
Signed-off-by: Kevin H. Luu <[email protected]>
|
Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits. |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a Mergify rule to automatically rebase pull requests that are 40 or more commits behind the main branch. While this helps keep PRs updated, I have raised a concern about the automatic force-pushing involved in the rebase action. This can be disruptive for collaborative workflows on shared branches and carries a risk of developers losing work if they are not careful. Please review the comment for details on the potential impact on the development workflow.
| - name: rebase-pr-older-than-40-commits | ||
| conditions: | ||
| - base = main | ||
| - "#commits-behind >= 40" | ||
| actions: | ||
| rebase: |
There was a problem hiding this comment.
This rule will automatically rebase and force-push to pull request branches. While keeping branches up-to-date is beneficial, the automatic force-push can be very disruptive for developers, especially if multiple people are collaborating on the same feature branch.
A force-push rewrites the branch's history, which can cause the following problems for collaborators:
- Their local branch will diverge from the remote branch.
- They will need to manually reset their local branch (e.g., with
git fetch origin; git reset --hard origin/<branch-name>) to continue working, potentially losing local-only commits if they are not careful.
This can lead to confusion, lost work, and a frustrating developer experience. Please consider the collaboration patterns in this repository. If branches are frequently shared, this automatic action might cause more harm than good.
No description provided.