wordsforthewise wordsforthewise - 1 year ago 84
Git Question

Git -- merge master with branch and create new file from master that was renamed

I'm trying merge in the master branch to my own branch, using

git merge master

after doing
git checkout mybranch

I renamed a file in my branch from

Everything seems all good after I merge, but the
file does not show up in
. Is there an easy way to get the file (or if it was 100s of files I renamed, etc) back to match the master?

Answer Source

git checkout master something.py will pull file something.py from master into your current working copy

Recommended from our users: Dynamic Network Monitoring from WhatsUp Gold from IPSwitch. Free Download