now my old git has had an opportunity to upgrade my vim to
7.2.108 i see something in the update.log i don't remember
seeing with svn:
src/feature.h: needs update
apparently git wants to bark at me because i had the
temerity to modify feature.h without sending my changes back
to the repository
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?
- replace my feature.h
- with no warning?
- with a message?
- merge the repository feature.h with my modified one?
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...
IIRC svn was mute on the fact that i had modified that file
and replaced it unmerged if it was modified in the svn
repository -- it was pursuant to me to watch his update.log
for 'feature.h' so i could re-apply my changes when it got
replaced
sorry to be such a high maintenance git newbie
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
