Andreas Bernauer, 13.02.2009: > > Christian MICHON wrote: > > 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'.
And I have already corrected myself: with more than one remote branches, that will be merged into the custom branch, this doesn't work anymore. > This will temporarily remove your local changes, And also the changes introduced by the feature branches. > fetch and merge the remote > commits and reapply your local changes. And also reapply the feature branches, so they get new SHA1s and you have to resolve merge conflicts that have already been resolved before. > 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. I recommend rebase when having just one remote branch for updating the custom branch. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
