Related, perhaps off topic.
I was doing "hg bisect" a few days ago, the pass/fail detection had to
build vim and run a test. The process aborted after several iterations
because of a writable source file and the working directory couldn't be
updated. (I made notes, but lost them in the heat of
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
wrote:
>
> On Sa, 19 Aug 2023, tooth pik wrote:
>
> >
> > Unstaged changes after reset:
> > M src/po
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
> Plea
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
Up
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
attached (i think)
--
--
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_d
