Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #### Applying patches for janice ####
- Patching build ..
- Da https://github.com/t4n017/android_build
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit dc0a659.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Not currently on any branch.
- You are currently cherry-picking commit dd3f9a6.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching device/samsung/janice ..
- Da https://github.com/t4n017/android_device_samsung_janice
- * branch pa -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 9d048e6.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching device/samsung/u8500-common ..
- Da https://github.com/t4n017/android_device_samsung_u8500-common
- * branch pa -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 8afae39.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching external/webp ..
- Da https://github.com/t4n017/android_external_webp
- * branch pa -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 2b8c5e2.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching frameworks/av ..
- Da https://github.com/t4n017/android_frameworks_av
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 14ff212.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching frameworks/base ..
- Da https://github.com/t4n017/android_frameworks_base
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 8c55586.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Not currently on any branch.
- You are currently cherry-picking commit 8ad9220.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching frameworks/native ..
- Da https://github.com/t4n017/android_frameworks_native
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 87a8c8a.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching packages/apps/DeskClock ..
- Da https://github.com/t4n017/android_packages_apps_DeskClock
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit f92e1c5.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching packages/apps/Settings ..
- Da https://github.com/t4n017/android_packages_apps_Settings
- * branch kitkat -> FETCH_HEAD
- fatal: bad object 5f714b984071982e486e9ccad4554960fc483c8d
- error: non è stato possibile applicare d134aad... ScreenRecorder: Hide the preference tab
- suggerimento: dopo aver risolto i conflitti, segna i path corretti
- suggerimento: con 'git add <path>' o 'git rm <path>' ed eseguire
- suggerimento: il commit del risultato con 'git commit'
- error: 'cherry-pick' is not possible because you have unmerged files.
- suggerimento: Fix them up in the work tree,
- suggerimento: and then use 'git add/rm <file>' as
- suggerimento: appropriate to mark resolution and make a commit,
- suggerimento: or use 'git commit -a'.
- fatal: cherry-pick non riuscito
- Patching packages/services/Telephony ..
- Da https://github.com/t4n017/android_packages_services_Telephony
- * branch kitkat -> FETCH_HEAD
- error: 'cherry-pick' is not possible because you have unmerged files.
- suggerimento: Fix them up in the work tree,
- suggerimento: and then use 'git add/rm <file>' as
- suggerimento: appropriate to mark resolution and make a commit,
- suggerimento: or use 'git commit -a'.
- fatal: cherry-pick non riuscito
- error: 'cherry-pick' is not possible because you have unmerged files.
- suggerimento: Fix them up in the work tree,
- suggerimento: and then use 'git add/rm <file>' as
- suggerimento: appropriate to mark resolution and make a commit,
- suggerimento: or use 'git commit -a'.
- fatal: cherry-pick non riuscito
- Patching system/core ..
- Da https://github.com/t4n017/android_system_core
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 4478c4a.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Not currently on any branch.
- You are currently cherry-picking commit 2ef56c9.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching system/vold ..
- Da https://github.com/t4n017/android_system_vold
- * branch kitkat -> FETCH_HEAD
- Not currently on any branch.
- You are currently cherry-picking commit 61b66e6.
- nothing to commit, working directory clean
- The previous cherry-pick is now empty, possibly due to conflict resolution.
- If you wish to commit it anyway, use:
- git commit --allow-empty
- Otherwise, please use 'git reset'
- Patching vendor/pa ..
- Da https://github.com/t4n017/android_vendor_pa
- * branch kitkat -> FETCH_HEAD
- error: 'cherry-pick' is not possible because you have unmerged files.
- suggerimento: Fix them up in the work tree,
- suggerimento: and then use 'git add/rm <file>' as
- suggerimento: appropriate to mark resolution and make a commit,
- suggerimento: or use 'git commit -a'.
- fatal: cherry-pick non riuscito
- Patching done.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement