I've noticed that when you're merging and there is a 'both added' merge conflict, git creates the .LOCAL and .REMOTE files for the merge, but not the .BASE file. Now, there isn't an actual base file because the file has been added anew in both branches, but wouldn't it make sense for git to just create an empty .BASE file anyway? Conceptually, new content is being added on both sides to an empty container - the fact that it didn't exist as a file on the filesystem before is something git isn't meant to care about. It also makes things easier for merge tools which are expecting a .BASE file; in practice, scripts just usually create the empty .BASE file anyway. Why not have git do this itself without a script? Best regards, Jeremy Morton (Jez) -- 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