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

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?

1 answer

1 accepted

0 votes
Accepted answer

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)

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

436 views 6 9
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you