Hello: I'm having a problem with using git and making local changes to files I maintain. In particular: I make changes to syntax/sh.vim (locally), and then git fails:
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 ... I don't particularly want to try to merge my changes with the repository; instead, I just want git to leave my changes alone. My solution so far involves manually saving the changed files, wiping out the repository copy on my local system, getting a fresh copy via git, and putting my changed files back. Is there a better solution? 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.
cd vim
git stash
git pull
git stash pop
../../cnfg
cd src
gmake -j${COREQTY}
