Is it normal to have the conflict column having value while merging from a branch to trunk...and how to see where is the conflict..For example I have a tabbed report with different sections in each tab.. how do i know where is the conflict ?
Similarly while looking into checkin history, how do i know which part of the report has been modified.. !!
Does anyone have similar question..