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

It is not exactly what you were looking for, but it was useful to me:

git checkout -p  --  ...

It is a mix of some answers.