How to selectively merge or pick changes from another branch in Git?
问题 I\'m using git on a new project that has two parallel -- but currently experimental -- development branches: master : import of existing codebase plus a few mods that I\'m generally sure of exp1 : experimental branch #1 exp2 : experimental branch #2 exp1 and exp2 represent two very different architectural approaches. Until I get further along I have no way of knowing which one (if either) will work. As I make progress in one branch I sometimes have edits that would be useful in the other