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

keep in-progress label on merge-conflict #137

Open
SimonLab opened this issue Jul 4, 2017 · 0 comments
Open

keep in-progress label on merge-conflict #137

SimonLab opened this issue Jul 4, 2017 · 0 comments
Labels
bug please-test priority-2 T25m
Milestone
Sprint 2

Comments

@SimonLab
Copy link
Member

SimonLab commented Jul 4, 2017

If a PR has a merge conflict, notify the user, add the label "merge-conflict", remove the "awaitinb-review" label if already on the PR but otherwise leave the "in-progress" label if the PR is still being build:
image
@naazy naazy self-assigned this Aug 9, 2017
@ghost ghost added this to the Sprint 2 milestone Aug 9, 2017
naazy added a commit that referenced this issue Aug 9, 2017
@naazy
keep in-progress label on merge-conflict #137
38692fe
@naazy naazy mentioned this issue Aug 9, 2017
Merged
@ghost ghost modified the milestones: Sprint 2, Backlog Aug 9, 2017
samhstn pushed a commit that referenced this issue Sep 1, 2017
@Shouston3
Merge pull request #144 from dwyl/keepInProgressLabelOnMergeConflict
e119e54 
keep in-progress label on merge-conflict #137
@naazy naazy assigned ghost and unassigned naazy Sep 1, 2017
@jammur jammur unassigned ghost Dec 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug please-test priority-2 T25m
Projects
None yet
Milestone
Sprint 2
Development

No branches or pull requests
2 participants
@SimonLab @naazy