git sync failed about legit

[kennethreitz]

That means there was a merge conflict when restoring the stashed content. I need to catch that and produce some pretty output saying what happened / how to fix it.

[neilmiddleton]

Something else that will need some tweaking is that when this occurs you can be left with a stash - the problem then lies further down the line when later syncs try to pop the stash which in itself can cause merging problems. Currently the only way round this is to drop the stash manually.

[cormamax]

So how do we fix this? I've tried to overriding my local code with what is in the repository, and git sync still gives me the error.

[AndrewKL]

this is rather annoying

[weakish]

duplicated by #35