Hey there @daniel22, thanks for the interesting question!
Dusting my dictionary a bit, I found that something is conflicting when there is a state of opposition, creating conflict, and something is conflicted when it’s confused on what choice to make, facing conflict.
From my perspective, this explains why a file would be conflicted, since it identifies that another version of itself exists there and is met with conflict. In other words, the file isn’t conflicting, but conflicted.
Did this post help you? If so, please give it a Like below. Did this post fix your issue/answer your question? If so please press the 'Accept as Solution' button to help others find it. Still stuck?Ask me a question!(Questions asked in the community will likely receive an answer within 4 hours!)