On Thu, Aug 5, 2010 at 10:41 AM, Eugene Sajine <euguess@xxxxxxxxx> wrote: > On Wed, Aug 4, 2010 at 7:36 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: >> 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. >> > > > There is no output after I add build.xml with resolved conflicts. When > i do git status build.xml doesn't show up there. > > I tried another way: > After i have a conflict i add the build.xml withtout resolving > conflicts. Then I unstage it - it's status changes from "both added: " > to "modified" > Then i can resolve the conflict, which means build.xml returns to it's > last committed state. But then i'm back to square one as build.xml is > not showing in changes, so i cannot add it and i still cannot commit > because of partial commit. > > Thanks, > Eugene > When i experimenting with it with test repos - it is working OK. So, i believe it will be very difficult to reproduce. I'm still having this problem with two repos of mine, but as it is not common, i gotta dig deeper there. Thanks, Eugene -- 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