@soccerfan6789 I have built aosp for my nexus 4. I tried doing some basic cherry picking from cm and pa (those which I thought wont have conflict) just to check whether I am going in right direction and it went well.
Now I want to move forward. Lets say I want to add Notification LED control. So for that I need to pick these commits.
First into package/apps/settings:
https://github.com/AOSPA/android_pa...mmit/6b6632a3a6fe4f944819be0af67a5e65dbdead5a
Second into frameworks/base:
https://github.com/AOSPA/android_frameworks_base/commit/47114889dbc722d3cd31378f47ddd1b025bf0e86
Now, as I do the first cherry pick, I get error, upon running 'git status' I see this:
Code:
brajesh@Brajesh-Sharma:~/android/aosp-kitkat/packages/apps/Settings$ git cherry-pick 6b6632a3a6fe4f944819be0af67a5e65dbdead5a
error: could not apply 6b6632a... Notification LED Control (2/2).
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
brajesh@Brajesh-Sharma:~/android/aosp-kitkat/packages/apps/Settings$ git status
# Not currently on any branch.
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#[COLOR="DarkGreen"] new file: res/layout/dialog_light_settings.xml
# new file: res/layout/preference_application_light.xml
# new file: res/layout/pulse_time_item.xml
# new file: res/values/pa_arrays.xml
# modified: res/xml/display_settings.xml
# new file: res/xml/notification_light_settings.xml
# modified: src/com/android/settings/DisplaySettings.java
# new file: src/com/android/settings/notificationlight/AlphaPatternDrawable.java
# new file: src/com/android/settings/notificationlight/ApplicationLightPreference.java
# new file: src/com/android/settings/notificationlight/ColorPanelView.java
# new file: src/com/android/settings/notificationlight/ColorPickerView.java
# new file: src/com/android/settings/notificationlight/LightSettingsDialog.java
# new file: src/com/android/settings/notificationlight/NotificationLightSettings.java[/COLOR]
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# [COLOR="Red"]deleted by us: res/values/pa_strings.xml[/COLOR]
#
brajesh@Brajesh-Sharma:~/android/aosp-kitkat/packages/apps/Settings$
How should I proceed from here onwards in solving the conflict?
@Cl3Kener : The way you've written the guide is excellent, it is useful for the newcomers. As a suggestion, there is no such detailed guide for cherry-picking. If you get time I would request you to create a guide on this with examples (I know its very tough and time taking)