Changing other files during conflict resolution doesn't get reflected on PRs

[keith]

If you resolve a conflict and manually edit and add another file in the rebase, when you rebasepr it won't pick up the manually edited change, using replacepr can fix it but isn't ideal