ahh -- you didn't say the "--hard" option before -- that fixed it, thank you
i don't understand any of this, honestly, i didn't change anything On Sun, Aug 20, 2023 at 3:34 AM Christian Brabandt <cbli...@256bit.org> wrote: > > On Sa, 19 Aug 2023, tooth pik wrote: > > > > > 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 > > Not sure what you are trying to say here. You need to get rid of the > changes to your local files before you can update them. So that's why I > suggested to use git reset --hard. Note this will wipe out all your > changes. So only do this if you don't care about it. Other options would > be to use git stash for example, that would stash away your changes (and > you could get them later back). > > Best, > Christian > -- > Fashion is a form of ugliness so intolerable that we have to alter it > every six months. > -- Oscar Wilde > > -- > -- > 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 vim_dev+unsubscr...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/vim_dev/ZOHQKfeIIrh8kn0D%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 vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/CALfSX1xPo%2BaLr0y7%3DW1QM3caQtign3Sarx8f5bvD46MeksbOZQ%40mail.gmail.com.
