I just tried this btw, If you merge B and C you will only have a conflict if the changes in B and C touch the same regions of the file. If not the merge is ma

I just tried this btw, If you merge B and C you will only have a conflict if the changes in B and C touch the same regions of the file. If not the merge is made automatically and the changes from both branches are reflected in the new file.