Jan 122013
How to merge a specific file from another branch in Git
Answer:
You have two branches, develop and master. The develop branch contains a lot of commits but you only want to merge a particular commit (of two files), what would you do?
You can use git cherry-pick but the easiest way to do and most people need is the following:
# git checkout master
# git checkout develop /path/to/file1
# git checkout develop /path/to/file2
..
git commit -m 'Merge changes from develop for file1 and file2'
