On Thursday 25 June 2009 3:41 pm, Markus Heidelberg wrote: > > _sc_, 25.06.2009: > > > should i try to find out what the conflict is with some form of git > > diff, fix, and commit it, or is it something that needs to be fixed > > on the repository end? or... > > Hey, it is not broken, I don't push an unresolved repo out :)
again this was a learning experience for me -- thank you for your patience i did another git reset --hard HEAD, (love that command, btw), created and used (successfully) a second update script that merges the runtime before the feat -- i am now writing this with 7.2.218 when you say > Maybe you can change your script to choose which branch to merge > first. you put yourself at risk of being asked how one might go about doing such an ambitious thing you may consider yourself asked, but asked with no pressure -- my current two script system works for now, and if you do answer i'd like it to be written at your leisure with examples and explanations who knows -- if it can be tested as easily as git can be asked for a diff without specifying any module name or branch or option, maybe the answer can be a quickie anyway, answer or not, thanx again markus, you're the man sc --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
