> 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
Git is terrible at helping you solve problems. What you probably need
is:
git checkout runtime/gvim.desktop runtime/vim.desktop
In "normal" version control systems this would be called "revert", as in
revert local changes.
--
MICHAEL PALIN PLAYED: 1ST SOLDIER WITH A KEEN INTEREST IN BIRDS, DENNIS, MR
DUCK (A VILLAGE CARPENTER WHO IS ALMOST KEENER THAN
ANYONE ELSE TO BURN WITCHES), THREE-HEADED KNIGHT, SIR
GALAHAD, KING OF SWAMP CASTLE, BROTHER MAYNARD'S ROOMATE
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
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/201905091807.x49I7q47017384%40masaka.moolenaar.net.
For more options, visit https://groups.google.com/d/optout.
