Merge Issue

[Petchimuthu]

Hi,
 
   I'm facing an issue while merge a branch with another branch.

Issue Details:

    Conflict Base window as empty and the file name shown as another file
name.

The files are present in only the destination branch alone.

I can't understand how it is in conflict list.

Can you tell me how is this possible?


merging source/client/*DomainsAPI.java* and source/client/*PortalAPI.java*
to source/client/*DomainsAPI.java*

merging source/client/*FilesAPI.java* and source/client/*PortalAPI.java* to
source/client/*FilesAPI.java*

merging source/client/*MenusAPI.java* and source/client/*PortalAPI.java* to
source/client/*MenusAPI.java*

merging source/server/*SitesDataAccessImpl.java* and
source/server/*PagesDataAccessImpl.java* to
source/server/*SitesDataAccessImpl.java*


Thanks,
Muthu.





--
View this message in context: http://mercurial.808500.n3.nabble.com/Merge-Issue-tp4033841.html
Sent from the General mailing list archive at Nabble.com.