AnsweredAssumed Answered

MERGE Conflict

Question asked by kalyanikumari.patra on Apr 26, 2018
Latest reply on May 3, 2018 by kalyanikumari.patra

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