jtapolczai / FileSync

Syncrhonising file trees
Apache License 2.0
1 stars 0 forks source link

Handle file/directory name conflicts #16

Closed jtapolczai closed 8 years ago

jtapolczai commented 8 years ago

What to do if an object with name X is a file in one branch and a directory in another?

jtapolczai commented 8 years ago

Possible solutions:

jtapolczai commented 8 years ago

There should be a conflict-check before the merging process. The user should be offered the choice of renaming the offending files (by appending a GUID at their end) and re-trying the join.