Well the interesting this was it happened rather easily while working with another guy.
We have a pattern that says
rootpath/ - all public headers
-> private - all private headers
-> source - all sourcefiles
because we are currently creating a software from scratch we worked both independently on two different features.
Feature one -> add a filesystem encapsulation mechanism
Feature two -> add a value factory mechanism
so we added in our framework under System
(framework/System)
both independently the folder private.
User one on branch main/SCM1421 FileSystem
User two on branch main/SCM1444 DomValueFactories
Merging both back into main -> error.
I could only overcome this by renaming the folder private to private2, move the file, checkin, delete private2
And as far as i can tell from previous projects stuff like what happens rather often.
Yes it won't happen so often for files ... but directories are not source files