I have GIT merge conflict flagged in IDEA, and I merging develop branch into my Rental_Return branch. I see the branches code on left and right and it seems good.
Right side is empty as file was not in develop branch. How conflict happen then? I expect no conflict in this case.
Also I cannot get the code in the middle window - named "result". It contains some code which is not on left or right sides of merge window. Where is this code comes from? I could think it
PS I not edited code shown on screenshot manually. It is all what I see once after I clicked Merge.