Christ van Willegen wrote: > > Op 19 aug. 2016 22:05 schreef "Charles E Campbell" > <[email protected] <mailto:[email protected]>>: > > 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? > > 'git stash push' and 'git stash pop'? > > I tried git stash push instead of git push -- and it still doesn't work:
Usage: git stash list [<options>] or: git stash show [<stash>] or: git stash drop [-q|--quiet] [<stash>] or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>] or: git stash branch <branchname> [<stash>] or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] or: git stash clear 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 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
