Advertisement
Guest User

Untitled

a guest
Oct 1st, 2014
167
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.29 KB | None | 0 0
  1. #### Applying patches for janice ####
  2.  
  3.  
  4. Patching build ..
  5. Da https://github.com/t4n017/android_build
  6. * branch kitkat -> FETCH_HEAD
  7. Not currently on any branch.
  8. You are currently cherry-picking commit dc0a659.
  9.  
  10. nothing to commit, working directory clean
  11. The previous cherry-pick is now empty, possibly due to conflict resolution.
  12. If you wish to commit it anyway, use:
  13.  
  14. git commit --allow-empty
  15.  
  16. Otherwise, please use 'git reset'
  17. Not currently on any branch.
  18. You are currently cherry-picking commit dd3f9a6.
  19.  
  20. nothing to commit, working directory clean
  21. The previous cherry-pick is now empty, possibly due to conflict resolution.
  22. If you wish to commit it anyway, use:
  23.  
  24. git commit --allow-empty
  25.  
  26. Otherwise, please use 'git reset'
  27.  
  28.  
  29. Patching device/samsung/janice ..
  30. Da https://github.com/t4n017/android_device_samsung_janice
  31. * branch pa -> FETCH_HEAD
  32. Not currently on any branch.
  33. You are currently cherry-picking commit 9d048e6.
  34.  
  35. nothing to commit, working directory clean
  36. The previous cherry-pick is now empty, possibly due to conflict resolution.
  37. If you wish to commit it anyway, use:
  38.  
  39. git commit --allow-empty
  40.  
  41. Otherwise, please use 'git reset'
  42.  
  43.  
  44. Patching device/samsung/u8500-common ..
  45. Da https://github.com/t4n017/android_device_samsung_u8500-common
  46. * branch pa -> FETCH_HEAD
  47. Not currently on any branch.
  48. You are currently cherry-picking commit 8afae39.
  49.  
  50. nothing to commit, working directory clean
  51. The previous cherry-pick is now empty, possibly due to conflict resolution.
  52. If you wish to commit it anyway, use:
  53.  
  54. git commit --allow-empty
  55.  
  56. Otherwise, please use 'git reset'
  57.  
  58.  
  59. Patching external/webp ..
  60. Da https://github.com/t4n017/android_external_webp
  61. * branch pa -> FETCH_HEAD
  62. Not currently on any branch.
  63. You are currently cherry-picking commit 2b8c5e2.
  64.  
  65. nothing to commit, working directory clean
  66. The previous cherry-pick is now empty, possibly due to conflict resolution.
  67. If you wish to commit it anyway, use:
  68.  
  69. git commit --allow-empty
  70.  
  71. Otherwise, please use 'git reset'
  72.  
  73.  
  74. Patching frameworks/av ..
  75. Da https://github.com/t4n017/android_frameworks_av
  76. * branch kitkat -> FETCH_HEAD
  77. Not currently on any branch.
  78. You are currently cherry-picking commit 14ff212.
  79.  
  80. nothing to commit, working directory clean
  81. The previous cherry-pick is now empty, possibly due to conflict resolution.
  82. If you wish to commit it anyway, use:
  83.  
  84. git commit --allow-empty
  85.  
  86. Otherwise, please use 'git reset'
  87.  
  88.  
  89. Patching frameworks/base ..
  90. Da https://github.com/t4n017/android_frameworks_base
  91. * branch kitkat -> FETCH_HEAD
  92. Not currently on any branch.
  93. You are currently cherry-picking commit 8c55586.
  94.  
  95. nothing to commit, working directory clean
  96. The previous cherry-pick is now empty, possibly due to conflict resolution.
  97. If you wish to commit it anyway, use:
  98.  
  99. git commit --allow-empty
  100.  
  101. Otherwise, please use 'git reset'
  102. Not currently on any branch.
  103. You are currently cherry-picking commit 8ad9220.
  104.  
  105. nothing to commit, working directory clean
  106. The previous cherry-pick is now empty, possibly due to conflict resolution.
  107. If you wish to commit it anyway, use:
  108.  
  109. git commit --allow-empty
  110.  
  111. Otherwise, please use 'git reset'
  112.  
  113.  
  114. Patching frameworks/native ..
  115. Da https://github.com/t4n017/android_frameworks_native
  116. * branch kitkat -> FETCH_HEAD
  117. Not currently on any branch.
  118. You are currently cherry-picking commit 87a8c8a.
  119.  
  120. nothing to commit, working directory clean
  121. The previous cherry-pick is now empty, possibly due to conflict resolution.
  122. If you wish to commit it anyway, use:
  123.  
  124. git commit --allow-empty
  125.  
  126. Otherwise, please use 'git reset'
  127.  
  128.  
  129. Patching packages/apps/DeskClock ..
  130. Da https://github.com/t4n017/android_packages_apps_DeskClock
  131. * branch kitkat -> FETCH_HEAD
  132. Not currently on any branch.
  133. You are currently cherry-picking commit f92e1c5.
  134.  
  135. nothing to commit, working directory clean
  136. The previous cherry-pick is now empty, possibly due to conflict resolution.
  137. If you wish to commit it anyway, use:
  138.  
  139. git commit --allow-empty
  140.  
  141. Otherwise, please use 'git reset'
  142.  
  143.  
  144. Patching packages/apps/Settings ..
  145. Da https://github.com/t4n017/android_packages_apps_Settings
  146. * branch kitkat -> FETCH_HEAD
  147. fatal: bad object 5f714b984071982e486e9ccad4554960fc483c8d
  148. error: non è stato possibile applicare d134aad... ScreenRecorder: Hide the preference tab
  149. suggerimento: dopo aver risolto i conflitti, segna i path corretti
  150. suggerimento: con 'git add <path>' o 'git rm <path>' ed eseguire
  151. suggerimento: il commit del risultato con 'git commit'
  152. error: 'cherry-pick' is not possible because you have unmerged files.
  153. suggerimento: Fix them up in the work tree,
  154. suggerimento: and then use 'git add/rm <file>' as
  155. suggerimento: appropriate to mark resolution and make a commit,
  156. suggerimento: or use 'git commit -a'.
  157. fatal: cherry-pick non riuscito
  158.  
  159.  
  160. Patching packages/services/Telephony ..
  161. Da https://github.com/t4n017/android_packages_services_Telephony
  162. * branch kitkat -> FETCH_HEAD
  163. error: 'cherry-pick' is not possible because you have unmerged files.
  164. suggerimento: Fix them up in the work tree,
  165. suggerimento: and then use 'git add/rm <file>' as
  166. suggerimento: appropriate to mark resolution and make a commit,
  167. suggerimento: or use 'git commit -a'.
  168. fatal: cherry-pick non riuscito
  169. error: 'cherry-pick' is not possible because you have unmerged files.
  170. suggerimento: Fix them up in the work tree,
  171. suggerimento: and then use 'git add/rm <file>' as
  172. suggerimento: appropriate to mark resolution and make a commit,
  173. suggerimento: or use 'git commit -a'.
  174. fatal: cherry-pick non riuscito
  175.  
  176.  
  177. Patching system/core ..
  178. Da https://github.com/t4n017/android_system_core
  179. * branch kitkat -> FETCH_HEAD
  180. Not currently on any branch.
  181. You are currently cherry-picking commit 4478c4a.
  182.  
  183. nothing to commit, working directory clean
  184. The previous cherry-pick is now empty, possibly due to conflict resolution.
  185. If you wish to commit it anyway, use:
  186.  
  187. git commit --allow-empty
  188.  
  189. Otherwise, please use 'git reset'
  190. Not currently on any branch.
  191. You are currently cherry-picking commit 2ef56c9.
  192.  
  193. nothing to commit, working directory clean
  194. The previous cherry-pick is now empty, possibly due to conflict resolution.
  195. If you wish to commit it anyway, use:
  196.  
  197. git commit --allow-empty
  198.  
  199. Otherwise, please use 'git reset'
  200.  
  201.  
  202. Patching system/vold ..
  203. Da https://github.com/t4n017/android_system_vold
  204. * branch kitkat -> FETCH_HEAD
  205. Not currently on any branch.
  206. You are currently cherry-picking commit 61b66e6.
  207.  
  208. nothing to commit, working directory clean
  209. The previous cherry-pick is now empty, possibly due to conflict resolution.
  210. If you wish to commit it anyway, use:
  211.  
  212. git commit --allow-empty
  213.  
  214. Otherwise, please use 'git reset'
  215.  
  216.  
  217. Patching vendor/pa ..
  218. Da https://github.com/t4n017/android_vendor_pa
  219. * branch kitkat -> FETCH_HEAD
  220. error: 'cherry-pick' is not possible because you have unmerged files.
  221. suggerimento: Fix them up in the work tree,
  222. suggerimento: and then use 'git add/rm <file>' as
  223. suggerimento: appropriate to mark resolution and make a commit,
  224. suggerimento: or use 'git commit -a'.
  225. fatal: cherry-pick non riuscito
  226.  
  227.  
  228. Patching done.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement