I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the files that were added to my trunk after the creation of my branch were flagged as a “tree conflict”. Is there a way to avoid this in the future?
I don’t think these are being properly flagged.