How can I selectively merge or pick changes from another branch in Git?

Question

I\'m using Git on a new project that has two parallel -- but currently experimental -- development branches:

• master: import of existing codebase pl

Answer 1

A simple approach for selective merging/committing by file:

git checkout dstBranch
git merge srcBranch

// Make changes, including resolving conflicts to single files
git add singleFile1 singleFile2
git commit -m "message specific to a few files"
git reset --hard # Blow away uncommitted changes