Hi Eugene, Eugene Sajine wrote: [in an add/add conflict] > when i resolve the conflict the build.xml returns to its > last committed state of dest repo, so git cannot determine any > changes. > Therefore, i cannot execute git add for this file and i cannot commit > my merge results Could you explain further (preferrably with a simple example transcript)? I would think that after an add/add conflict, a simple "git add" would mark the file resolved and allow committing. -- 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