Hi and thanks for giving the git repo a try. _sc_, 06.02.2009: > < FIVE > > line 139 > > git mergetool > > showed nothing that needed to be fixed
This is only needed, if merge conflicts arise. You will notice it, if it's the case. > lines 147-232 of the README detail a merge of runtime files that > looked both confusing and unnecessary -- we got the runtime when we > chose "vim-with-runtime" back in step three -- so far no gaps in the > runtime have presented themselves > > lines 235-254 also has to do with runtime, but, as above, we already > have it -- this section appears to be if you want a git branch of just > runtime > > lines 257-275 show how to use rsync to update the runtime into git's > origin/stuff branch, No, the runtime files are updated in the currently checked out branch. I use the branch 'vim-runtime' therefor, of course. > whatever that is, The stuff branch contains the git repo specific files (docs and scripts). > but again we already have the > runtime, and I *think* future 'git pull's will retrieve updates to the > runtime as well as the source Yes, all your assumptions above are correct. I think I should move the custom branch part to "Basic use" since it definetly is something that most people will use. Then the "Advanced use" will only contain "uninteresting" stuff. Probably these two categories should be renamed to "For users" and "For developers" or so, since it was mainly used to document what I did to setup and do to maintain the branches. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
