On Thu, Jun 6, 2019 at 12:04 PM Christian Brabandt <[email protected]> wrote: > On Do, 06 Jun 2019, tooth pik wrote: > > > this morning i get a > > > > Updating 32e197701..75ee544f9 > > error: Your local changes to the following files would be overwritten by > > merge: > > src/testdir/test_clientserver.vim > > Please commit your changes or stash them before you merge. > > Aborting > > > > when i try to git pull > > Did you change test_clientserver.vim? Then git stash it away and pull > again and do git stash pop afterwards. Or do you not care? Then git > reset --hard before doing git pull
i have a vague recollection of trying to turn logging on to see why my tests all failed -- no joy -- but i put it back the way it was but maybe git is checking time stamps anyway git reset --hard did the trick for me -- thx christian > Best, > Christian > -- > Nicht die einzelnen Anreden, sondern die zufälligen Äußerungen der > Eltern und die absichtlose Fortsetzung und Offenbarung eines > Charakters wirken so unglaublich auf die Kinder, denen durch ihre > Verehrung alles so fest anfliegt. > -- Jean Paul > > -- > -- > 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/20190606170420.GO23877%40256bit.org. > For more options, visit https://groups.google.com/d/optout. -- -- 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/CALfSX1yUTrkdgn1pDtkPAO3-ya08kP7bKiNWz-5zwhOWZ%3D_CBw%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
