On Fri, Feb 13, 2009 at 5:04 AM, _sc_ <[email protected]> wrote: > src/feature.h: needs update
It barks you because it honors your modification. Before updating your working tree with the latest tip of a branch (either by switching to a new branch or doing a pull), it tries very hard in making sure that the update will not bork your changes. IOW it won't replace your feature.h unless you really ask it to. > my question is: what will [my old] git do if/when feature.h > gets modified on the repository end? > > - bark at me with the same warning? By default, yes. > - replace my feature.h > - with no warning? > - with a message? Yes if you specifically ask it to overwrite your local modification. > - merge the repository feature.h with my modified one? Yes if you have 'git add'ed your modification to feature.h and that changes happens to be exactly the same as the new change coming in from the 'reposition end'. If it's not the same then the merge will not happen. > i can not only live with getting barked at for having > uncommitted changes, i think it qualifies as a Good Idea -- > but the attention called to this module as caused me to > wonder if his bark is as good as his bite... There a few alternatives to keeping your local changes: 1. Put it in the stash (git help stash) 2. Commit it into your own branch, and rebase that branch against its 'parallel' remote branch every now and then when the 'repository end' is updated. 3. Manually keep it as separate patches. > sorry to be such a high maintenance git newbie Everyone is a newbie once. Nobody is born non-newbie is guess, unless you're that Button guy. nazri. --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
