Handling openfn.yaml in git merges

[josephjclark]

The openfn.yaml files contains two things: 1) workspace configuration options (shared by all connected projects), 2) metadata about the currently checked out project

If you're using git and keeping one project on each branch (think gh sync v2) then openfn.yaml makes sense. It tells you what each branch represents

But when merging staging branch into main, you might want to merge the workspace config stuff, but you do NOT want to merge the active project stuff

Options:

1. add some kind of git hook to correct the openfn.yaml after merge (but how would we know? Feels a bit over complicated)
2. split the file into two. Maybe .projects/.active and then openfn.yaml is all workfspace config
3. ??