top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

When does clearcase show conflict while merging two files ?

0 votes
434 views

While merging files, sometimes clearcase show non-conflict and conflicting merge. How does clearcase identify those things ?

posted Sep 3, 2014 by Neelam

Share this question
Facebook Share Button Twitter Share Button LinkedIn Share Button

1 Answer

0 votes

Its not just with clearcase but true with any version control system. Its because of three way merge say for example you have a element A and you created the branch/element B from A and then merge then you will not face any conflict or merge issue.

Not support you created B from A and someone else created C from A and both of you have done the changes in the same line then merge will find a conflict when you merge B to C. Hope this makes the doubt clear how its been identified.

answer Sep 4, 2014 by Salil Agrawal
Thanks Salil.
commented Sep 4, 2014 by Neelam
Similar Questions
+1 vote
Clearcase : What could be the reason while merging code, files are automatically gets reserved checkout ?

Is it the default behavior of clearcase tool or its behavior can be changed ?

+2 votes
Clearcase: Hiden view-private files not coming over after reformatview

We are trying to migrate views from Solaris to Unix. So we are doing a "reformat -dump" on the Solaris end and then a "reformat -load" on the Linux end.

All's going well EXCEPT - any "." view-private files (hidden files) are not coming over. Any ideas how I can make sure that these files are brought over as well?

...