Tinacms: 409 error when saving master while working on origin

[jhuggett]

Description

When saving on master on tinacms.org while working on origin it doesn't visually fail but logs a 409 (conflict) in the console.

Steps to reproduce

• Enter edit mode (working on origin)
• Make changes on master
• Save

Expected result

Require me to switch branches.

Actual result

Looks like it saved properly but there's a 409 error in the console.

Environment

prod

[kendallstrautman]

@jhuggett did this issue happen again on your second round of setup?

[jhuggett]

@kendallstrautman This is an issue on tinacms.org, I should have mentioned it in the issue sorry, will update it

[kendallstrautman]

I see, I wonder if its cause master is locked — actually I'm not 100% sure master is locked on .org, but it would be worth a look! In any case it seems like we need to catch this error and not have it fail silently