Hi guys. So I've had a few people PM me and ask for help cherry picking features to build a ROM from source. I've decided I might as well post a guide with what I've gathered. I'll outline the procedure for cherry-picking from both gerrit as well ...
Resolving Conflicts from Cherry-Picking
So you've found the commit you want to cherry-pick. You've gone to the right place in your source code to apply it. You've told your computer to apply the cherry-pick. It said it couldn't. Now what?
Cherry-Picking a Feature from GitHub
To begin cherry-picking, you need to find the GitHub “commit” for what you want. A commit is a record of the changes that were made to achieve something, whether it be a new feature or a bug fix.
Cherry Picking a feature from Gerrit
To begin cherry-picking, you should first go to the gerrit for your desired cherry-pick and find its entry/entries. I'll cherry-pick Halo from the ParanoidAndroid gerrit into AOSP.
Because I want Halo, I'...
Troubleshooting/After the Cherry-Pick
Once you've finished adding a cherry-pick, a whole variety of things can happen. You might:
build, and it will stop with some build erros
build, and it will complete, but something will go wrong when yo...