On Do, 09 Mai 2019, tooth pik wrote:
> i get a weird error when i try to git pull this patch
>
> Updating eae1b91fe..a6c27c47d
> error: Your local changes to the following files would be overwritten by
> merge:
> runtime/gvim.desktop
> runtime/vim.desktop
> Please commit your changes or stash them before you merge.
> Aborting
If you haven't made any changes that you want to keep,
git reset --hard should get you into a clean state again.
Best,
Christian
--
Um seine Kinder braucht sich heutzutage niemand zu sorgen. Wenn sie zu
nichts taugen, können sie noch immer in die Politik gehen.
-- Michel Evquem Seigneur de Montaigne
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20190509184811.GO31339%40256bit.org.
For more options, visit https://groups.google.com/d/optout.
