In master I have some files that should better live in a feature branch. I'd like to create such a branch and have the files there, at the same time removing them from master.
I'm not concerned about history, i.e., the files need not to be removed from previous commits. When I do
$ git ls-files
stay.txt
move.txt
$ git checkout -b feature
Switched to a new branch 'feature'
$ git checkout master
Switched to branch 'master'
$ git rm move.txt
the situation in the HEAD is much like I want it. However I'll run into problems, when I want to merge master to feature. Do I have to deal with it or is there a solution for such a scenario?