During testing, there were about three merge conflicts, and although I fixed them, the merge process started over again in the order 558197->558209->558369-> This makes it take longer to merge SVN 1.14 (the current version) than SVN 1.9.7 when doing large-scale merges. Is there a way to fix this?
2026년 1월 6일 (화) PM 2:50, free yang 제공업체: TortoiseSVN < [email protected]>님이 작성: > I tried testing with visual svn 5.4.5, but the same problem occurred. > > [image: merge.jpg] > > > After resolving the merge, if you click resolve conflicts, the merge check > will be performed again from the beginning. > 2025년 12월 30일 화요일 PM 7시 26분 15초 UTC+9에 free yang님이 작성: > >> Thanks for the reply. I'll have to consider upgrading. >> >> 2025년 12월 30일 화요일 PM 6시 10분 43초 UTC+9에 Stefan님이 작성: >> >>> On Tuesday, December 30, 2025 at 8:47:18 AM UTC+1 free yang wrote: >>> >>> We are using the paid version of VisualSVN 4.2.1. Should we upgrade to a >>> newer version? >>> >>> >>> Yes! >>> VisualSVN 4.2.1 uses svn 1.10. The latest VisualSVN server uses svn >>> 1.14.5. >>> >>> -- > You received this message because you are subscribed to a topic in the > Google Groups "TortoiseSVN" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/tortoisesvn/A_cfPS9nfGE/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > [email protected]. > To view this discussion visit > https://groups.google.com/d/msgid/tortoisesvn/0973a2cc-822a-49d0-ba4e-a417a93d11efn%40googlegroups.com > <https://groups.google.com/d/msgid/tortoisesvn/0973a2cc-822a-49d0-ba4e-a417a93d11efn%40googlegroups.com?utm_medium=email&utm_source=footer> > . > -- 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 visit https://groups.google.com/d/msgid/tortoisesvn/CAMst%2Bq1qM5PVLWx488uGde6sui-DtREO5MrH3m4vwh9SHmbOfQ%40mail.gmail.com.
