Fix version history

[josephjclark]

Short Description

• Ensure the new workflow_history from app state is tracked
• When checking out a project, write a forked_from map from each workflow into openfn.yaml
• When checking for divergence, ensure forked_from is the head of the workflow in the app (but only for workflows we've changed locally...
• ... and when merging, we only merge the workflows that have changed (just to be sure we don't revert anything)

Fixes #1231

List any considerations/cases/advice for testing/QA here.

AI Usage

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

• Code generation (copilot but not intellisense)
• Learning or fact checking
• Strategy / design
• Optimisation / refactoring
• Translation / spellchecking / doc gen
• Other
• I have not used AI

You can read more details in our Responsible AI Policy

[josephjclark]

So the deploy stuff seems to be working. Got a problem now where I'm getting conflicts every time I pull, even when tehre aren't conflicts (remote is ahead of local so we can just overwrite). This might be because I'm doing a generic merge - but like on deploy, the test is a little different to general merge test

Also I've messed the tests up but that's kind of anticipated - will fix soon