-
Notifications
You must be signed in to change notification settings - Fork 27
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
When cherry-pick a conflicting PR, add a label to indicate this PR has conflicting #539
Comments
I think it's a good idea that we can add a |
This is very easy to implement, if anyone wants to implement the feature you can ping me. I will provide some help! |
provide a typical negative example: https://github.com/pingcap/dm/pull/1685/files very hard to see there should be a conflict |
After trying this I found that it is not an easy fix. This is because git's detection of conflicts is rather complicated. There are false positives, for example: ti-community-infra/test-dev#408 This PR does have a conflict, but it's a conflict between a delete and a modify operation, not a conflict in the code. There is currently no way to fix this issue. |
Issues go stale after 90d of inactivity. |
Stale issues rot after 30d of inactivity. |
/remove-lifecycle rotten |
Issues go stale after 90d of inactivity. |
Stale issues rot after 30d of inactivity. |
/remove-lifecycle rotten |
Issues go stale after 90d of inactivity. |
/remove-lifecycle stale cc: @wuhuizuo, PTAL~ |
Issues go stale after 90d of inactivity. |
Stale issues rot after 30d of inactivity. |
Feature Request
Is your feature request related to a Issue or PR(Optional)
Which project: DM
PR or Issue Link: https://github.com/pingcap/dm/pull/1695/files
Describe the feature you'd like:
As title, I don't want to search if there's
<<<<<<<<
. And I do want bot to create a PR so it's no need that I manually create one.Do you have any ideas on how to implement it?(Optional)
The text was updated successfully, but these errors were encountered: