_sc_, 25.06.2009: > 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
The only way I'm currently aware of would be to grep the output of $ git log ..origin/vim-with-runtime --pretty=format:%b $ git log ..origin/feat/rel-line-numbers --pretty=format:%b for the pattern "Conflicts:" and merge the branch with conflicts first. If both branches contain conflicts then first merge the feature branch, since conflicts with official runtime files should be trivial to solve, that means just pick the appropriate side of the merge as merge result. If you have more than 1 feature branches, this would be trickier, I guess. Maybe an octopus merge of the feature branches would be a solution. However, that may fail in non-trivial cases, but I don't have much experience with it. I don't know if there is a real way to query whether a merge caused conflicts and "Conflicts:" is just what git writes into the commit message template after such a merge. It could be changed manually by me or in another git version, but I doubt it will happen. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
