Resolving conflict with "evil twins" (missing folders and files)
One answer
Remember, you're resolving an evil twin conflict so be aware that the resolution is essentially making you choose which history to continue and build upon. The other file1.txt's history still exists but can't be shown at the same time in the history view.
Comments
Thank you for your response Tim!.
And also, the change sets that fill the gap probably will contain lines that I don't want to merge.
If you don't want some other added files from stream B, you would have to remove them after accepting the change set. Accepting that change set is the only thing I can think of that would work. You can't accept a part of a change set.
I can't think of anything else that you can currently do to get around the gap + evil twin conflict. If anything can be done to do this without accepting the gap filling change set, it would need a patch so that you can fix both issues at the same time when you perform the gap merge. You could try going through IBM support and see if this can be fixed with a patch.
So, could you confirm that gap + evil twin conflict is not a supported scenario?
When there are evil twins, we do not offer to perform a content merge since they are really different files. You can only choose to keep the file that is on disk, or the file that is incoming. If you want to keep your file, simply click 'Ignore" in the dialog. If you want to keep what is 'incoming', delete the file 'folderParent/folderChild/file1.txt' that is on disk and check-in the 'deletion change' into the gap 'resulting change set'. Now in the "Missing File and Parent" dialog you posted above, you can select "Set Parent Folder" and select the 'folderParent/folderChild' directory. This will not result in the error you saw before..
<continue reading my comment below> (The restriction on the # of characters per comment is annoying.
If you want to actually compare the differences and do a merge (although the fact that they are actually different files implies the content may not even be similar), instead of deleting file1.txt, rename it to file1MINE.txt and check-in that change. Now select "Set Parent Folder" and select the 'folderParent/folderChild' director. Now you have the two files on disk, in the same folder. In the "Package Explorer" in Eclipse, you can select both files, right-click and select "Compare With" --> "Each Other". This will open up a compare editor and show you the differences, and it will also have each side editable (so you can choose which one you actually want to keep). I would keep the file that is in the stream you intent to flow to, and then delete the other file when done. (checking-in the changes and deletion of the file you don't want into the resulting change set).