On Fri, Feb 13, 2009 at 4:18 AM, _sc_ <tooth...@swbell.net> 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 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. If you've a modified feature.h and you pull from upstream, what you described will happen. what is strange, is that once you fix a conflict, git should be smart enough to solve all future conflicts. -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside ! --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
