On Friday, January 15, 2016 at 2:27:28 PM UTC-6, Pavol Juhas wrote: > On Friday, January 15, 2016 at 1:32:05 PM UTC-5, Bram Moolenaar wrote: > ... > > 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?". > > Actually, they need to make a commit if they want to have local changes in > their > files and also merge-in any updates to the same files from the main > repository. > Git refuses to do a merge if there are uncommitted (read unsaved) local > changes. > > Rebase is not necessary. A standard pull (which implies a merge operation) > will produce the same content in the working directory. > > I think a git workflow for the users with local customizations could be: > > (1) commit any changes to the git-tracked files: > > git commit -a -m "best ever vim customization" > > (2) pull in any updates from the main repository: > > git pull > > The "git pull" above should just work unless there is a conflicting > change to some lines locally and in the main repository. >
Ah, but we don't WANT a merge. The customized changeset is simply acting as a stash that we don't need to manually push/pop from. Thus I suggested rebasing, and Matteo improved with using "git pull --rebase" instead of a second manual rebase step. After creating the "local only" changeset you could just use that single pull command to get updates and keep your local changes. As long as you never push you're safe. If you sometimes push you'll need to be careful not to push your "local only" changeset. Now if only git had a "secret" phase concept like Mercurial... -- -- 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.
