Merge conflicts in CP PRs are not handled well

[roryabraham]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Action Performed:

1. Create a PR with changes in a given file.
2. Give the PR the CP Staging label.
3. Merge the PR.
4. Create another PR with changes in the same file (to ensure that there will be conflicts on staging).
5. Give the PR the CP Staging label.
6. Merge the PR.
7. The CP PR created for the second PR will be created but not automerged, due to conflicts.

Expected Result:

1. The CP PR should be auto-assigned to the author of the original (second) PR.
2. PR checks (lint, test, etc...) should run on the CP PR.

Actual Result:

1. The PR was not auto-assigned.
2. PR checks did not run on the CP PR, even after manually pushing new code to the PR.

Workaround:

n/a

Platform:

GitHub only

Version Number: 1.0.77-2

View all open jobs on Upwork

[HorusGoul]

Will work on this next week

[HorusGoul]

I haven't been able to work on this. I'll return this to the pool as I'm going to be OOO for a few days. I'll gladly pick it after that again as I'll have less workload.

[HorusGoul]

It's still free so I'll pick it again 😄