[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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).


 1. T1 and T2 develop code and commit to their respective folder
 2. From each team folder, code has to be merge to common folder Development > trunk
 3. T1 merged to Development > trunk.
 4. T2 updates their folder by merging from Development> trunk.
 5. On merging, T2 facing files conflict.

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)


Thank you,
Bhaskar Jebamani


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

svn file merge.png
Received on 2016-07-26 07:03:07 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.