In a feature branch we moved one directory (it was commited as file move not delete / creation). Before merging my branch on master, I merge master on it.
When doing "git merge master", the files appears on the old location as untracked and on the new location the file doesn't have the changes from master.
Any idea if I can fix this without manual merging ?
