Hi, following the below thread, led me to do some tests: https://stackoverflow.com/a/69114710/11705021 One of the test can be seen here, in the last example in my question: https://stackoverflow.com/questions/69150777/git-mv-doesnt-work-as-expected-wrong-files-location I wanted to get confirmation for my case: Does `git merge -s ort` command, doesn't know to detect new folder location when merging it? It did worked for folders and files renaming, and new files under existing folders (as describe here: https://stackoverflow.com/a/52227201/6309) Ariel
