Hello, So I have a situation where the mergeinfo for 2 folder is conflicted. I am not 100% sure how this happened. But right now my best guess is that normally we merge from the root o fthe repository from the root of another branch, and we recently merged from a sub folder to the url of the other sub folder.
When clicking "Edit" the save and resolve don't work. So when clicking save and resolve when it first appears, literally nothing happens. If I postpone and look at it after and I click save it takes me to a "save as" screen, presumably not knowing what file it actually needs to write to. When selecting "Accept Incoming" the resulting merge info is blank (it does not match either the base or the local copy). This is also true for "Accept Incoming For Conflicts" When I click "Mark As Resolved" that folder no longer appears as modified in the commit, even though at a minimum there is a new file that has been added. Overall from a programmer prospective I would guess that it is having trouble identifying the file that contains the property values for that folder correctly. Right now I have no path forward that will results in using the property value for the incoming merge on that folder. Thank you -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/73d06705-474f-4b78-938e-847b79e07c97n%40googlegroups.com.
