add more descriptive error message for ReadWriteConflictErrors

[tanishqkancharla]

@ccorcos added a custom implementation of outdent that's a bit simpler. Also the package.json changed, because I ran prettier, and I guess it was using spaces (it's been converted to tabs, since that's in the prettier config). That's also the only difference to the package-lock.

[ccorcos]

Run git reset master -- package.json package-lock.json to clean everything up

[tanishqkancharla]

Got it. Since i'm making a PR from my fork, I had to add another remote "upstream" and reset from there.