Merge Conflict Test https://github.com/dwyl/dwylbot/issues/64

[ghost]

Merge Conflict Test https://github.com/dwyl/dwylbot/issues/64

[simonlabapp[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but doesn't have a correct assignee. Please assign someone to review the pull request, thanks.

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[dwylbot[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but doesn't have a correct assignee. Please assign someone to review the pull request, thanks.

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[codecov[bot]]

Codecov Report

Merging #118 into master will decrease coverage by 1.97%. The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #118      +/-   ##
==========================================
- Coverage   98.08%   96.11%   -1.98%     
==========================================
  Files          22       19       -3     
  Lines         157      103      -54     
==========================================
- Hits          154       99      -55     
- Misses          3        4       +1

Impacted Files	Coverage Δ
web/models/user.ex	50% <0%> (-50%)	:arrow_down:
web/controllers/rules/issue/inprogress.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/issue/noassignees.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/issue/time_estimation.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/list_rules.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/helpers.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/pr/no_description.ex	100% <0%> (ø)	:arrow_up:
web/controllers/github_api/in_memory.ex	100% <0%> (ø)	:arrow_up:
web/controllers/processes/wait.ex	100% <0%> (ø)	:arrow_up:
web/controllers/rules/issue/no_description.ex	100% <0%> (ø)	:arrow_up:
... and 3 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 9f91b9d...89d7d11. Read the comment docs.

[dwylbot[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but doesn't have a correct assignee. Please assign someone to review the pull request, thanks.

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[nelsonic]

dis PR still needed? (please close if not)

[dwylbot[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but some tests are failing. Please fix the tests and reassign when ready :+1: Thanks

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[ghost]

@SimonLab please can you review and approve this? Need to test https://github.com/dwyl/dwylbot/issues/64#issuecomment-310112549

[dwylbot[bot]]

@markwilliamfirth, a reviewer has been added to the pull request. The pull request looks ready for review (no "in-progress" label). So the reviewer has been added as an assignee and the "awaiting-reivew" label as been added to.

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[dwylbot[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but some tests are failing. Please fix the tests and reassign when ready :+1: Thanks

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[dwylbot[bot]]

:warning: @markwilliamfirth, the pull request is in "awaiting-review" but doesn't have a correct assignee. Please assign someone to review the pull request, thanks.

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new

[SimonLab]

@markwilliamfirth I'm not sure how you want to test #64 with this PR. To recap #64: when a "good" PR is merged then if there are any other PRs with merge conflicts the "awaiting review" should be removed. This PR has some merge conflict so it's not a "good" PR and if I merge it you wouldn't be able to test #64

Also I think we should test dwylbot on another repo, it feels a bit weird to have a lot of PRs open and closed on the dwylbot repo itself and it adds some noise to the notifications. Now that dwylbot is a Github App you can install it on any other repos

[dwylbot[bot]]

:wave: @jammur, you have requested a review for this pull request so we have taken the liberty of assigning the reviewers :tada:.

Have a great day :sunny: and keep up the good work :computer: :clap:

Any questions, complaints, feedback, contributions? If you prefer, you can also send us anonymous feedback: https://dwyl-feedback.herokuapp.com/feedback/new