See screenshot. What I did: - made a lot of changes in "working copy 1" of branch A, which include the deletion of some files. - some changes and deletion of the same files in the working copy of branch B. - commit branch B. - merge B into "working copy 2" of A. - commit "working copy 2" of A. - update "working copy 1" of A. -> tree conflict on the deleted files. -> "Accept incoming conflicts" shows mentioned error. Resolution not possible.
Despite the tree conflicts, this working principle is a suitable way for me: - extract the changes of one development job from many changes of multiple combined developments by copying them to another branch - then commit the changes of that one job - then merge it back into the original branch, but in another working copy, and commit it there. - then update the original working copy, so that some changes become revisioned. This works fine most of the time, except the fact that resolving tree conflicts sometimes takes long time (https://groups.google.com/g/tortoisesvn/c/6vqi7kjyrkQ) or simply doesn't work (this post). -- 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/f11cfe13-19d8-495c-a320-7eef7ef67481n%40googlegroups.com.
