Replace the contents of one directory in GIT with that of master

https://stackoverflow.com/a/12404351

remove Dir2 from branchA and fetch it from master branch:

$ git checkout branchA
$ git rm -r Dir2
$ git checkout master -- Dir2
$ git commit -m "replaced Dir with Dir2 from master"