Eugene Sajine wrote: > So, I'm removing all conflict markers and removing the incoming line > with the property value=projectOne leaving it as projectTwo. > This effectively means that there is no changes in build.xml for git. > And I'm stuck because i cannot add file, that is not changed Sorry I wasn’t clear before. Could you give output from attempting to add the file? It is supposed to work. -- 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