On Thu, May 9, 2019 at 7:22 PM tooth pik <[email protected]> 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
This is related to the following patches; the second-last one of them should have fixed it: 23276 8.1.1147 desktop file translations are requiring manual updates 5358 8.1.1149 building desktop files fails with older msgfmt 1773 8.1.1150 generating desktop files not tested on Travis 2978 8.1.1227 duplicate entries in the generate .desktop files 2567 8.1.1240 runtime desktop files are overwritten by build 2144 8.1.1255 building desktop files fails on FreeBSD I don't know how to fix this on git, but if you are on Mercurial you can either pop these desktop file changes into a new mq patch (after enabling the mq extension) or commit them as local changes to your clone. They should not be touched thereafter, since the current versions of Vim directly use the desktop files found in the po subdirectory if they exist, and only use the runtime/*.desktop as a fallback. Best regards, Tony. -- -- 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/CAJkCKXtnrP8phZvxjvq%2B%2B35wvn8bDkPZUd%3DUJi2XrZe%2BXWoP8Q%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
