Skip to content
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.

Sign up for GitHub

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

Jump to bottom

When cherry-pick a conflicting PR, add a label to indicate this PR has conflicting #539

Open
1 task done
lance6716 opened this issue May 14, 2021 · 14 comments · Fixed by #652
Open
1 task done

When cherry-pick a conflicting PR, add a label to indicate this PR has conflicting #539

lance6716 opened this issue May 14, 2021 · 14 comments · Fixed by #652
Assignees
@wuhuizuo
Labels
help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. lifecycle/rotten type/feature Categorizes issue or PR as related to a new feature.

Comments

@lance6716
Copy link

lance6716 commented May 14, 2021 •
edited

Feature Request

  • I have searched the issues of this repository and believe that this is not a duplicate.

Is your feature request related to a Issue or PR(Optional)

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)
@lance6716 lance6716 added the type/feature Categorizes issue or PR as related to a new feature. label May 14, 2021
@Rustin170506
Copy link
Contributor

I think it's a good idea that we can add a status/cherry-pick-conflicting label to the conflicts PR.

@Rustin170506 Rustin170506 added good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. and removed type/feature Categorizes issue or PR as related to a new feature. labels May 16, 2021
@Rustin170506
Copy link
Contributor

This is very easy to implement, if anyone wants to implement the feature you can ping me. I will provide some help!

@ti-chi-bot ti-chi-bot added type/feature Categorizes issue or PR as related to a new feature. and removed type/enhancement labels May 16, 2021
@lance6716 lance6716 mentioned this issue May 18, 2021
Merged
@lance6716
Copy link
Author

provide a typical negative example: https://github.com/pingcap/dm/pull/1685/files

very hard to see there should be a conflict

@Rustin170506 Rustin170506 mentioned this issue Jul 20, 2021
Merged
ti-chi-bot pushed a commit that referenced this issue Jul 20, 2021
@Rustin170506
feat: add label in case of conflict (#652)
a168b92 
close #539
@Rustin170506 Rustin170506 reopened this Jul 21, 2021
@Rustin170506 Rustin170506 removed the good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. label Jul 21, 2021
@Rustin170506
Copy link
Contributor

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.

@Rustin170506 Rustin170506 mentioned this issue Jul 21, 2021
Merged
@ti-chi-bot
Copy link
Member

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle stale

@ti-chi-bot
Copy link
Member

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle rotten

@lance6716
Copy link
Author

/remove-lifecycle rotten

@ti-chi-bot
Copy link
Member

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle stale

@ti-chi-bot
Copy link
Member

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle rotten

@lance6716
Copy link
Author

/remove-lifecycle rotten

@ti-chi-bot
Copy link
Member

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle stale

@Mini256
Copy link
Member

Mini256 commented Jun 17, 2022

/remove-lifecycle stale

cc: @wuhuizuo, PTAL~

@ti-chi-bot
Copy link
Member

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle stale

@ti-chi-bot
Copy link
Member

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Send feedback to sig-community-infra or Mini256.
/lifecycle rotten

@wuhuizuo wuhuizuo self-assigned this Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@wuhuizuo wuhuizuo

Labels
help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. lifecycle/rotten type/feature Categorizes issue or PR as related to a new feature.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

feat: add label in case of conflict Rustin170506/ti-community-prow
5 participants
@lance6716 @wuhuizuo @Mini256 @Rustin170506 @ti-chi-bot