Hi, On Tue, 23 Jan 2007, Linus Torvalds wrote: > It would be kind of cool to have the whole "merge-recursive" logic > (which can handle multiple ancestors etc - unlike the above) able to do > this, but that's a whole 'nother kettle of fish. You'd lose all the renaming logic when doing it strictly on a file level. So I suggest opening a sidebranch, doing the merge, and just pick the new file as you proposed with "git checkout -f sidebranch file". Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html