svn multi-folder merge conflict
From: Bhaskar Jebamani <BhaskarJ_at_in.unibiz.com>
Date: Tue, 26 Jul 2016 08:54:06 +0530
HI ,
I'm new to SVN branching and merging. I have created SVN folder structure as (ref image).
[cid:emb889bd8f-e116-4234-89d5-ce0b70b278b6_at_jebamani]
1. T1 and T2 develop code and commit to their respective folder
on trying to resolve/edit conflict, diff is not showing the Development conflict code in left panel and right panel has T2 conflict code.
Is the folder structure, right? I am missing any merge setting between folders???
After changing merge setting I am able to see the expected files in the diff panel, but the diff includes the lines that have been deleted long back. (ref img)
[cid:em7f24cd28-f336-447a-8aa5-43d463eaf26e_at_jebamani]
Thank you,
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.