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. -- -- 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.
