Charles E Campbell wrote: > Christ van Willegen wrote: >> Op 19 aug. 2016 22:28 schreef "Charles E Campbell" >> <drc...@campbellfamily.biz <mailto:drc...@campbellfamily.biz>>: >>> I tried git stash push instead of git push -- and it still doesn't work: >> Probably only 'stash' then... >> >> > That doesn't work either, unfortunately: > > runtime/syntax/sh.vim: needs merge > runtime/syntax/sh.vim: needs merge > runtime/syntax/sh.vim: unmerged (711971ea4ae7b3a72c2062c18130b3eca35dc67b) > runtime/syntax/sh.vim: unmerged (34b8ab79e45bb1f39827e940e4b3428bedfad64b) > runtime/syntax/sh.vim: unmerged (b285b04979551b260ab016ba089d9e69ded01612) > fatal: git-write-tree: error building trees > Cannot save the current index state > M runtime/doc/syntax.txt > U runtime/syntax/sh.vim > Pull is not possible because you have unmerged files. > Please, fix them up in the work tree, and then use 'git add/rm <file>' > as appropriate to mark resolution, or use 'git commit -a'. > runtime/syntax/sh.vim: needs merge > Cannot apply to a dirty working tree, please stage your changes > Oh, well -- I tried several things based on web searches, and none of them worked. I just went ahead and did what I know does work -- save off the affected files manually, wipe out the local copy, git clone https://github.com/vim/vim.git, and manually copy the affected files back to where they needed to be.
Regards, Chip Campbell -- -- 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. For more options, visit https://groups.google.com/d/optout.
