keep in-progress label on merge-conflict #137

[naazy]

keep in-progress label on merge-conflict #137

[dwylbot]

@naazy, 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

[codecov]

Codecov Report

Merging #144 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #144      +/-   ##
==========================================
+ Coverage   98.32%   98.33%   +<.01%     
==========================================
  Files          23       23              
  Lines         179      180       +1     
==========================================
+ Hits          176      177       +1     
  Misses          3        3

Impacted Files	Coverage Δ
web/controllers/rules/pr/merge_conflict.ex	100% <100%> (ø)	⬆️

---

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 79e802e...38692fe. Read the comment docs.

[iteles]

Adding @Danwhy and @Shouston3 as potential reviewers as they've shown interest in dwylbot in the past. If you guys have some spare time during the workday, please take a look 😊

[samhstn]

Looks great. Are there tests for these?

[naazy]

@Shouston3 re tests: #154

[samhstn]

Nice, I think it's fine for now