2009/11/23 Tobia Conforto: > > Has anybody had any success in merging the var-tabstops branch with > MacVim? I thought it would be easy, as the two branches must have a > common ancestor, but when I tried it gave me endless conflicts. What > am I missing? If anybody knows any better, any help is appreciated. > > git://repo.or.cz/vim_extended.git/refs/heads/feat/var-tabstops
Tobia, The MacVim repo is not based on the vim_extended repo (it was created after I set up the MacVim repo). There was a discussion on vim_dev a while back regarding rebasing MacVim.git on top of vim_extended.git which would simplify the merging of unofficial patches, but I find this dask rather daunting. As far as I can tell, the only way to accomplish this is to apply all MacVim.git commits as a series of patches on top of vim_extended.git and this way I'll loose all dates when each MacVim commit was performed (they'll all have the same date). If somebody were to tell me how to "merge" the two repositories whilst retaining all original commit information from the MacVim.git repo I'd consider doing this, but until then it is easier for me to simply keep things the way they are. Björn --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_mac" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
