Fixes to deploy

[josephjclark]

Short Description

This PR fixes two issues in deploy:

• When adding and removing workflows, the merge was failing to count them. This has been fixed.
• When deploying to a different project (ie, a project with a different UUID ), it turns out we have different rules to track the merge. This wasn't properly reflected in deploy before, but has now been fixed

QA Notes

Tests I've run locally:

✅ I can deploy a local project to its remote (with no alias)
✅ I can deploy a local project to its remote (with an alias)
✅ I can deploy a local project to a different remote

I'm really suffering from not having integration tests on this stuff but I just don't have time right now. Gonna have to hope this works

Frank reports that it's working for him, which is a huge confidence boost

AI Usage

Please disclose whether you've used AI anywhere in this PR (it's cool, we just
want to know!):

• I have used Claude Code
• I have used another model
• I have not used AI

You can read more details in our
Responsible AI Policy