Hi, > [merge branch where directory was renamed, but files were added in the > unrenamed directory] I think this problem is fundamentally untractable. If you move only some files to another directory, it is more obvious that you don't know where to put the newly created file (indeed, you might need it in _both_). Another non-obvious reason to fail is that you actually _want_ the new file to be the only one to reside in that directory. So I think you cannot solve that problem. IOW you have to resolve that conflict manually _anyway_. 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