Don't get confused by conflict markers

You’re in the middle of resolving merge conflicts.

git status | grep condition.schema
	both added:      api/condition.schema.json

Right now, api/condition.schema.json has conflict markers and is impossible to read.

To replace the file with one from another branch

git checkout master -- api/condition.schema.json
git status | grep condition.schema
	modified:   api/condition.schema.json

Try again with another branch

git checkout develop -- api/condition.schema.json
git status | grep condition.schema
# no diff, already on this branch

Go back to the merged version with the conflict markers

git checkout --conflict=merge -- api/condition.schema.json
git status | grep condition.schema
	both added:      api/condition.schema.json