Resets due to non-fast forward Git error