Ben Fritz wrote: > On Friday, January 15, 2016 at 9:06:31 AM UTC-6, Bram Moolenaar wrote: > > I think most users will be in this situation: > > > > - Initially check out Vim from github: > > > > git clone https://github.com/vim/vim.git > > > > - Change a makefile to set some options, or change bigvim.bat to match > > your Python version, etc. > > > > - Build Vim. > > > > So far so good. Now the Vim version on Github gets patches, the user > > will want to simply sync to the latest version and keep his local > > changes (assuming there are no merge conflicts). Now what is the git > > command for that? > > > > A simple "git pull" results in the error "Your local changes to the > > following files would be overwritten". > > "git merge" does the same thing, so it doesn't actually merge. > > > > Git is difficult... Searches show me all kinds of different options > > with branches and complex arguments. There must be a simple way... > > Well, you could commit your local changes, and just be careful to > never push them. Then you could rebase that change on every pull. Most > people won't be able to push to the official Vim repository anyway so > that won't be an issue.
And then the user would read the git help at https://git-man-page-generator.lokaltog.net/ Please keep in mind that people who don't know git and just want to build Vim without learning the (complex and confusing) git commands need step-by-step instructions that "just work". >From the above line "commit" gets the response "I don't want to commit my changes", and "what is rebase?". -- Any resemblance between the above views and those of my employer, my terminal, or the view out my window are purely coincidental. Any resemblance between the above and my own views is non-deterministic. The question of the existence of views in the absence of anyone to hold them is left as an exercise for the reader. The question of the existence of the reader is left as an exercise for the second god coefficient. (A discussion of non-orthogonal, non-integral polytheism is beyond the scope of this article.) (Ralph Jennings) /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- 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.
