so me and another cowor…

so, me and another coworker added new apps at the same time, and our merge conflict in workspace.json is pretty nasty. Any recommendations on a decent way to resolve this, other than just going through it and doing it manually?

Responses:

Are they the same name?

they aren’t the same name, no

You should be able to just copy the whole object and paste it

I know git is going crazy about it

git’s diff, isn’t that straightforward

it’s a bunch of smallish diffs speckled throughout the whole file

But they’re essentially namespaced objects and it should be enough to copy one of the projects configs and paste it after the other

https://www.npmjs.com/package/git-json-merge has been really helpful with merging json files sensibly

Thanks git-json-merge worked quite nicely

git st