Why a deleted file and recreated on different location is shown as renamed file using git status?

[Mukesh Tiwari]

Hi,

I had a file at following location 

/c/projects/myproject/app/code/local/Myproject/Shipping/controllers/Adminhtml/Matrixrate/ConfigController.php

I deleted it using rm command on Git bash and recreated on following location using touch command

/c/projects/myproject/app/code/local/Myproject/Shipping/controllers/Adminhtml/Multipletablerates222/Matrixrate/ConfigController.php

Now when I use git status command it shows the file as renamed file and in the bit bucket I get message

app/code/local/Myproject/Shipping/controllers/Adminhtml/ { → Multipletablerates222 } /Matrixrate/ConfigController.php (94% similar)

Will there be any problem if I merge my branch to my master branch?

[Tim Crall · Accepted solution]

git primarily tracks the content of files.  So since the content was (mostly) the same, it recognized that this was in effect the same file, which had just moved from one location to another.  So it tracked it as a move.  This shouldn't cause any problem with merging (unless the file in question has been edited by others in a conflicting way, in which case it will cause a standard merge conflict)