Unstaged changes after reset: M src/po/ja.sjis.po M src/po/zh_CN.cp936.po M src/po/zh_CN.po
error: Your local changes to the following files would be overwritten by merge: src/po/ja.sjis.po src/po/zh_CN.cp936.po src/po/zh_CN.po Please commit your changes or stash them before you merge. Aborting Updating 56bafd7a6..4b1cc7906 On Sat, Aug 19, 2023 at 3:09 PM Christian Brabandt <[email protected]> wrote: > > On Sa, 19 Aug 2023, tooth pik wrote: > > > attached (i think) > > Try git reset --hard to get rid of the local changes, then pull again > the latest changes. It should then work again. > > > Best, > Christian > -- > Successful and fortunate crime is called virtue. > -- Seneca > > -- > -- > 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/ZOEhhI4Gj%2BCbnSsH%40256bit.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/CALfSX1yJUiEqwtw3SPKU%2BCrpH8%3DRBOK6kd8zSEuHP-Mz4hamNQ%40mail.gmail.com.
