Hello Often because of the order we do merges in because I'll do them out of order it'll conflict on a folder not existing if a change is adding a file to it. I'm grateful for the conflict showing, however the only 2 options given are "Postpone" or "Mark as resolved". Where Marking as resolved skips doing any changes for that folder entirely.
I suggest another option here for when the folder's missing, which is "Create folder and continue merge". Since often this is a valid solution but the way to go about this is to revert the merges, create and add the folder, then re-do the merge. Cheers, Kieren -- 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 tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/8dc438cf-30e6-4432-ae0a-f22e59001a32n%40googlegroups.com.
