Hi, For the impatient, start [HERE]. I'm about to start shuffling files and directories around in a big project, while others keep working on their files. This is a bit scary as I still feel pretty much newbie in the GIT world :-) I did a little test as follows. Given a shared repository sandbox.git with a file in there I did the following, which worked fine. * [player one] clone the DB, edit the file, commit and push * [player two] clone the DB - git branch shuffle - git checkout shuffle - mkdir SomeDir - git mv file SomeDir - edit SomeDir/file - git commit -a * Sofar so good, now merge: - git checkout master - git pull (get player 1 changes) - git merge shuffle - git branch -d shuffle - git commit -a - git push Sofar so good, but during the tests I had two times problems: * Instead of "git mv file SomeDir" I simply used "mv file SomeDir" and git-add. Now I end up with two files and of course the changes are not merged. I can understand that. [HERE] * On a somewhat bigger test I moved a large directory using "git mv dir newdir" (where newdir is an existing directory). Now "git status" gives a lot of new and deleted files!? I guess I'm going to have a big mess if that happens in the real project. Moving some smaller test directories simply showed a series of renames. Can this be explained? Is this a bug? Thanks --- Jan - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
