[Samsung Galaxy Nexus] anandsamuel:
Help needed!!! Please somebody help!

so i repo synced and I added the cherry-picks to the rom on terminal but im getting some errors.. Now I'm a noob at this stuff and this is my first time doing this and have been able to get this far by reading the guides available and googling stuff. but im lost as to what to do now. ive tried searching it on the net but havent been able to get too far with that. could someone please look at the code below and guide me as to what i need to do next.

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ git fetch http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base refs/changes/36/24736/7 && git cherry-pick FETCH_HEAD

remote: Counting objects: 14118, done

remote: Finding sources: 100% (11974/11974)

remote: Total 11974 (delta 6779), reused 11518 (delta 6779)

Receiving objects: 100% (11974/11974), 9.72 MiB | 1.98 MiB/s, done.

Resolving deltas: 100% (6779/6779), completed with 388 local objects.

From http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base

* branch refs/changes/36/24736/7 -> FETCH_HEAD

error: could not apply bc5b61d... Add CmCircleBattery to StatusBar options (1/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'

Recorded preimage for 'core/java/android/provider/Settings.java'

Recorded preimage for 'packages/SystemUI/res/layout/system_bar_notification_area.xml'

Recorded preimage for 'packages/SystemUI/res/layout/system_bar_notification_panel_title.xml'

Recorded preimage for 'packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java'

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ cd ..

sammy@ubuntu:~/JB_SOURCE/frameworks$ cd ..

sammy@ubuntu:~/JB_SOURCE$ cd packages

sammy@ubuntu:~/JB_SOURCE/packages$ cd apps

sammy@ubuntu:~/JB_SOURCE/packages/apps$ cd Settings

sammy@ubuntu:~/JB_SOURCE/packages/apps/Settings$ git fetch http://review.cyanogenmod.com/CyanogenMod/android_packages_apps_Settings refs/changes/35/24735/6 && git cherry-pick FETCH_HEAD

remote: Counting objects: 2716, done

remote: Finding sources: 100% (2386/2386)

remote: Total 2386 (delta 1290), reused 2250 (delta 1290)

Receiving objects: 100% (2386/2386), 4.58 MiB | 1.64 MiB/s, done.

Resolving deltas: 100% (1290/1290), completed with 52 local objects.

From http://review.cyanogenmod.com/CyanogenMod/android_packages_apps_Settings

* branch refs/changes/35/24735/6 -> FETCH_HEAD

error: could not apply bc73360... Add CmCircleBattery to StatusBar options (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'

Recorded preimage for 'res/values-cs/arrays.xml'

Recorded preimage for 'res/values-da/arrays.xml'

Recorded preimage for 'res/values-de/arrays.xml'

Recorded preimage for 'res/values-es/arrays.xml'

Recorded preimage for 'res/values-fi/arrays.xml'

Recorded preimage for 'res/values-fr/arrays.xml'

Recorded preimage for 'res/values-hu/arrays.xml'

Recorded preimage for 'res/values-it/arrays.xml'

Recorded preimage for 'res/values-ja/arrays.xml'

Recorded preimage for 'res/values-nl/arrays.xml'

Recorded preimage for 'res/values-pt/arrays.xml'

Recorded preimage for 'res/values-ru/arrays.xml'

Recorded preimage for 'res/values-tr/arrays.xml'

Recorded preimage for 'res/values-zh-rCN/arrays.xml'

Recorded preimage for 'res/values-zh-rCN/strings.xml'

Recorded preimage for 'res/values/arrays.xml'

Recorded preimage for 'res/values/strings.xml'

sammy@ubuntu:~/JB_SOURCE/packages/apps/Settings$ cd ..

sammy@ubuntu:~/JB_SOURCE/packages/apps$ cd Phone

sammy@ubuntu:~/JB_SOURCE/packages/apps/Phone$ git fetch http://review.cyanogenmod.com/CyanogenMod/android_packages_apps_Phone refs/changes/52/23252/6 && git cherry-pick FETCH_HEAD

remote: Counting objects: 795, done

remote: Finding sources: 100% (719/719)

remote: Total 719 (delta 377), reused 668 (delta 377)

Receiving objects: 100% (719/719), 752.02 KiB | 1.14 MiB/s, done.

Resolving deltas: 100% (377/377), completed with 20 local objects.

From http://review.cyanogenmod.com/CyanogenMod/android_packages_apps_Phone

* branch refs/changes/52/23252/6 -> FETCH_HEAD

error: could not apply 461a0d2... PhoneApp: Option to not lock automatically when a call ends (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'

Recorded preimage for 'res/values-pt/strings.xml'

Recorded preimage for 'res/values/strings.xml'

Recorded preimage for 'res/xml/call_feature_setting.xml'

Recorded preimage for 'src/com/android/phone/CallFeaturesSetting.java'

sammy@ubuntu:~/JB_SOURCE/packages/apps/Phone$ cd ..

sammy@ubuntu:~/JB_SOURCE/packages/apps$ cd ..

sammy@ubuntu:~/JB_SOURCE/packages$ cd ..

sammy@ubuntu:~/JB_SOURCE$ cd frameworks

sammy@ubuntu:~/JB_SOURCE/frameworks$ cd base

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ git fetch http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base refs/changes/51/23251/6 && git cherry-pick FETCH_HEAD

From http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base

* branch refs/changes/51/23251/6 -> FETCH_HEAD

error: 'cherry-pick' is not possible because you have unmerged files.

hint: Fix them up in the work tree,

hint: and then use 'git add/rm <file>' as

hint: appropriate to mark resolution and make a commit,

hint: or use 'git commit -a'.

fatal: cherry-pick failed

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ git fetch http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base refs/changes/52/19652/2 && git cherry-pick FETCH_HEAD

From http://review.cyanogenmod.com/CyanogenMod/android_frameworks_base

* branch refs/changes/52/19652/2 -> FETCH_HEAD

error: 'cherry-pick' is not possible because you have unmerged files.

hint: Fix them up in the work tree,

hint: and then use 'git add/rm <file>' as

hint: appropriate to mark resolution and make a commit,

hint: or use 'git commit -a'.

fatal: cherry-pick failed

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ ^C

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ ^C

sammy@ubuntu:~/JB_SOURCE/frameworks/base$ git status

# Not currently on any branch.

# You are currently cherry-picking.

# (fix conflicts and run "git commit")

#

# Changes to be committed:

#

#	modified: packages/SystemUI/res/layout/status_bar.xml

#	new file: packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java

#

# Unmerged paths:

# (use "git add/rm <file>..." as appropriate to mark resolution)

#

#	both modified: core/java/android/provider/Settings.java

#	both modified: packages/SystemUI/res/layout/system_bar_notification_area.xml

#	both modified: packages/SystemUI/res/layout/system_bar_notification_panel_title.xml

#	both modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

#	deleted by us: packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java

#

:(:confused:

---------- Post added at 07:11 PM ---------- Previous post was at 07:08 PM ----------

Thank you so much :)

I did some searching and was able to get it to work. now im stuck at cherry picking lol :(

Ive copied and pasted the code above