non-fast-forward error on quick image edit

[puppycodes]

- Do you want to request a feature or report a bug?

• Bug

- What is the current behavior?

• Currently in the Kaldi CMS example, when a post is created and an image is uploaded to the image field, then saved, and then immediately edited and a new image uploaded to replace the original image an error is produced "Failed to persist entry: API_ERROR: Update is not a fast forward" and the image cannot be updated.

- If the current behavior is a bug, please provide the steps to reproduce.
above ^^

- What is the expected behavior?
The expected behavior is either a more descriptive error for non technical people, or first fetching and merging as described here: https://help.github.com/articles/dealing-with-non-fast-forward-errors/

- Please mention your node.js, and operating system version.

Node v7.7.1, Mac OS Sierra 10.12.3

[fraktar]

+1 got the same error.

[jholmes033169]

This same problem happens regardless of whether it's an image or not. Just modifying a text field triggers the issue. Waiting a short period of time works around the issue.

[abumalick]

It is quite a big issue.
Did you find any quick fix for this ?
It is hard to tell my client:

Wait 2 minutes between edits.

[erquhart]

@Benaiah can you retest this now that the cache buster is merged?

[jholmes033169]

I have not tested thoroughly, but I have not seen in pop up and non one has reported it to me in a bit. I'll try to recreated problem case tonight.

[Benaiah]

This bug is due to getting a stale SHA of a git branch from GitHub, and then trying to push a commit that has an incorrect parent. This bug hasn't been reported since we merged the cachebuster, except in git-gateway because it doesn't currently have a cachebuster.

[Benaiah]

The last instance of this has been closed in #672.