Merging selected files from another branch into master
Wow, this should really be easier to find…but it took a while to find a quick way of doing this with git…
if you have two branches:
You can pull in changes from “other-branch” app/model/customer.rb with:
git checkout other-branch app/models/customer.rb
Then you can do a git commit as per normal.
Based on this article.