title: How to merge files in git when directory is already moved to different directory
body: <p>I was working on a branch taken from master branch for sometime. Now I need to merge my changes. The changes are in specific folder e.g. admin which is a subdirectory in my project. </p>
  
  <p>When I took the latest from master branch, this directory is moved to another location e.g. master/admin. So, now when I try to merge, it shows me all of the admin related files as new file. </p>
  
  <p>I would like to avoid any manual effort to merge and would like a way so that I can let git know that this is not new folder but is the existing folder which has been moved. </p>