On 18.12.2013 14:57, Bjorn Reese wrote:
On 12/18/2013 08:24 AM, Vladimir Prus wrote:
- Suppose I make a change in the superproject, bootstrap.sh, on develop branch, due to Boost.Build change. I also want to merge it to master, but I can't really use 'git merge', since it will merge references to 'develop' versions of all components - not something we want to do. It appears cherry-pick is what I want to do. I think that's not a problem, as we never modify 'master' directly, and therefore we won't get any merge conflicts in future. Does anybody see a problem?
If you want to merge a single file, you could use
git checkout master git checkout develop bootstrap.sh
Disclaimer: I have not used the above myself.
This is roughly equivalent to cherry-pick, except I need to commit by hand and copy the commit message by hand. - Volodya