Christian MICHON wrote: > On Fri, Feb 13, 2009 at 4:18 AM, _sc_ <[email protected]> wrote: >> the moral of the story is: keep your updates to feature.h >> invisible to git or he'll quit on you and you might easily >> miss it > > NO
I second that. > > Keep your own feature.h in a _dedicated_ branch. One thing you may > have not realized yet, is that in git a pull is actually fetch+merge. Or, as Markus Heidelberg already mentioned, say 'git pull --rebase'. This will temporarily remove your local changes, fetch and merge the remote commits and reapply your local changes. (In other words, git already has <revertfet> and <applyfeat> from _sc_ included and applies the script automatically.) If your local changes don't overlap with the remote changes, everythin is fine. Otherwise, git will fortunately complain, give you the chance to fix the conflict and continue to reapply your local changes. I could not think of a better way to handle this situation and it's so simple, just 'git pull --rebase' instead of 'git pull', that's all. -- Andreas. --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
