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

When only a few files have changed between the current commits of the two branches, I manually merge the changes by going through the different files.

git difftool ..

see also https://sites.google.com/site/icusite/setup/git-difftool