API tools faq
paste
Advertisement
thanhbv

git rebase as-web

thanhbv
Jul 20th, 2017
508
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 16.30 KB | None | 0 0
raw download clone embed print report
  1. $ git rebase --preserve-merges --onto cuongdd-gitlab 09d148f phom-gitlab
  2. Auto-merging src/net/sandinh/room/model/LdrModel.as
  3. CONFLICT (content): Merge conflict in src/net/sandinh/room/model/LdrModel.as
  4. Automatic merge failed; fix conflicts and then commit the result.
  5. Staged 'src/net/sandinh/room/model/LdrModel.as' using previous resolution.
  6. Error redoing merge 0376e161eac6019370146eaed947fc57a9f368a1
  7.  
  8. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 3/278)
  9. $ git rebase --continue
  10. [detached HEAD 9fe24f4] Merge with develop Conflict:    src/net/sandinh/room/model/LdrModel.as --HG-- branch : feature/phom-test
  11.  Author: vinhbt <vinhbt@sandinh.net>
  12. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  13. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  14. Auto-merging src/net/sandinh/room/utils/SDUtils.as
  15. Auto-merging src/net/sandinh/room/services/Api.as
  16. CONFLICT (content): Merge conflict in src/net/sandinh/room/services/Api.as
  17. Auto-merging src/net/sandinh/room/model/LdrModel.as
  18. CONFLICT (content): Merge conflict in src/net/sandinh/room/model/LdrModel.as
  19. Auto-merging src/net/sandinh/room/MainContext.as
  20. CONFLICT (content): Merge conflict in src/net/sandinh/room/MainContext.as
  21. Automatic merge failed; fix conflicts and then commit the result.
  22. Staged 'src/net/sandinh/room/MainContext.as' using previous resolution.
  23. Staged 'src/net/sandinh/room/model/LdrModel.as' using previous resolution.
  24. Staged 'src/net/sandinh/room/services/Api.as' using previous resolution.
  25. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  26. Error redoing merge 56a67deccfd7cff99fadfd9b0414791f4fcb0640
  27.  
  28. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 19/278)
  29. $ git rebase --continue
  30. [detached HEAD 4269448] Merge with develop
  31.  Author: vinhbt <vinhbt@sandinh.net>
  32. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  33. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  34. Auto-merging src/net/sandinh/room/Main.as
  35. Automatic merge failed; fix conflicts and then commit the result.
  36. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  37. Error redoing merge cc4916fecfd5725d0d948cac2cf0eda94143b9a1
  38.  
  39. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 23/278)
  40. $ git rebase --continue
  41. [detached HEAD afe8f00] Merge with develop
  42.  Author: vinhbt <vinhbt@sandinh.net>
  43. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  44. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  45. Auto-merging src/net/sandinh/room/MainContext.as
  46. CONFLICT (content): Merge conflict in src/net/sandinh/room/MainContext.as
  47. Automatic merge failed; fix conflicts and then commit the result.
  48. Staged 'src/net/sandinh/room/MainContext.as' using previous resolution.
  49. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  50. Error redoing merge 18487955c9753e639eada36060a3f45db7a43668
  51.  
  52. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 28/278)
  53. $ git rebase --continue
  54. [detached HEAD 66057cc] Merge with develop
  55.  Author: vinhbt <vinhbt@sandinh.net>
  56. Auto-merging src/net/sandinh/room/view/mediators/PayCardMediator.as
  57. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/PayCardMediator.as
  58. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  59. Auto-merging src/net/sandinh/room/model/LdrModel.as
  60. CONFLICT (content): Merge conflict in src/net/sandinh/room/model/LdrModel.as
  61. Automatic merge failed; fix conflicts and then commit the result.
  62. Staged 'src/net/sandinh/room/model/LdrModel.as' using previous resolution.
  63. Staged 'src/net/sandinh/room/view/mediators/PayCardMediator.as' using previous resolution.
  64. Error redoing merge bb37f4ab0eb594b0de70598c82a9331cc9e3e758
  65.  
  66. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 38/278)
  67. $ git rebase --continue
  68. [detached HEAD b68bc9d] Merge with develop
  69.  Author: vinhbt <vinhbt@sandinh.net>
  70. Auto-merging src/net/sandinh/room/view/MyUserView.as
  71. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/MyUserView.as
  72. Automatic merge failed; fix conflicts and then commit the result.
  73. Staged 'src/net/sandinh/room/view/MyUserView.as' using previous resolution.
  74. Error redoing merge 7e74a298ad28f858029da40233b2adbd764ccfde
  75.  
  76. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 48/278)
  77. $ git rebase --continue
  78. [detached HEAD 7b3291e] Merge
  79.  Author: vinhbt <vinhbt@sandinh.net>
  80. Auto-merging src/net/sandinh/room/view/mediators/PayCardMediator.as
  81. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/PayCardMediator.as
  82. Automatic merge failed; fix conflicts and then commit the result.
  83. Staged 'src/net/sandinh/room/view/mediators/PayCardMediator.as' using previous resolution.
  84. Error redoing merge a7ff4acdec5a7830d536866f84794905d77b0087
  85.  
  86. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 53/278)
  87. $ git rebase --continue
  88. [detached HEAD 852e46e] nạp thẻ
  89.  Author: vinhbt@VinhBTs-MacBook-Pro.local <vinhbt@VinhBTs-MacBook-Pro.local>
  90. Removing xml/emoticons.xml
  91. Auto-merging src/net/sandinh/room/view/ShareDialog.as
  92. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/ShareDialog.as
  93. Auto-merging src/net/sandinh/friend/view/AddFriendView.as
  94. CONFLICT (content): Merge conflict in src/net/sandinh/friend/view/AddFriendView.as
  95. Removing src/net/sandinh/SDImg.as
  96. Automatic merge failed; fix conflicts and then commit the result.
  97. Staged 'src/net/sandinh/friend/view/AddFriendView.as' using previous resolution.
  98. Staged 'src/net/sandinh/room/view/ShareDialog.as' using previous resolution.
  99. Error redoing merge 72985ec1a143e706bd801f704534d71fff11b5ba
  100.  
  101. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 84/278)
  102. $ git rebase --continue
  103. [detached HEAD 48bf927] Merge remote-tracking branch 'origin/phom' into phom
  104.  Author: cuongdd <cuongdd@sandinh.net>
  105. CONFLICT (modify/delete): src/net/sandinh/room/view/MainButtonsView.as deleted in HEAD and modified in c45631e0b52ed3591c4e92ea1dc87133cd606ffe. Version c45631e0b52ed3591c4e92ea1dc87133cd606ffe of src/net/sandinh/room/view/MainButtonsView.as left in tree.
  106. Automatic merge failed; fix conflicts and then commit the result.
  107. Error redoing merge 22688591ada5bd13bf45efd21ec283ec84f77dbd
  108.  
  109. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  110. $ git rebase --continue
  111. src/net/sandinh/room/view/MainButtonsView.as: needs merge
  112. You must edit all merge conflicts and then
  113. mark them as resolved using git add
  114.  
  115. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  116. $ git status
  117. HEAD detached from refs/heads/phom
  118. You have unmerged paths.
  119.   (fix conflicts and run "git commit")
  120.   (use "git merge --abort" to abort the merge)
  121.  
  122. Changes to be committed:
  123.  
  124.         modified:   src/net/sandinh/room/MainContext.as
  125.         modified:   src/net/sandinh/room/view/mediators/MainButtonsMediator.as
  126.         modified:   src/net/sandinh/room/view/mediators/MainMediator.as
  127.  
  128. Unmerged paths:
  129.   (use "git add/rm <file>..." as appropriate to mark resolution)
  130.  
  131.         deleted by us:   src/net/sandinh/room/view/MainButtonsView.as
  132.  
  133.  
  134. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  135. $ ls  src/net/sandinh/room/view/
  136. BoardJoinView.as  MainButtonsView.as  mediators/  PayMethodView.as  ShareDialog.as  WalletPayView.as
  137.  
  138. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  139. $ git rm src/net/sandinh/room/view/MainButtonsView.as
  140. src/net/sandinh/room/view/MainButtonsView.as: needs merge
  141. rm 'src/net/sandinh/room/view/MainButtonsView.as'
  142.  
  143. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  144. $ git status
  145. HEAD detached from refs/heads/phom
  146. All conflicts fixed but you are still merging.
  147.   (use "git commit" to conclude merge)
  148.  
  149. Changes to be committed:
  150.  
  151.         modified:   src/net/sandinh/room/MainContext.as
  152.         modified:   src/net/sandinh/room/view/mediators/MainButtonsMediator.as
  153.         modified:   src/net/sandinh/room/view/mediators/MainMediator.as
  154.  
  155.  
  156. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 144/278)
  157. $ git rebase --continue
  158. [detached HEAD ec8a3fe] Merge remote-tracking branch 'origin/phom' into phom
  159.  Author: Đỗ Đức Cường <cuongdd@sandinh.net>
  160. Removing src/net/sandinh/room/view/mediators/RoomSelectMediator.as
  161. Removing src/net/sandinh/room/view/mediators/MainButtonsMediator.as
  162. Removing src/net/sandinh/room/view/mediators/BoardThumbMediator.as
  163. Removing src/net/sandinh/room/view/RoomSelectView.as
  164. Removing src/net/sandinh/room/view/RoomSelectRowView.as
  165. Removing src/net/sandinh/room/view/MyUserView.as
  166. Removing src/net/sandinh/room/view/MainButtonsView.as
  167. Removing src/net/sandinh/room/view/LoadingProgress.as
  168. Removing src/net/sandinh/room/view/FindBoardView.as
  169. Removing src/net/sandinh/room/view/ChatView.as
  170. Removing src/net/sandinh/room/view/BoardJoinView.as
  171. CONFLICT (modify/delete): src/net/sandinh/room/services/Api.as deleted in ce13b81cc8300188e9de45f7aedf3b6b7ff3bc53 and modified in HEAD. Version HEAD of src/net/sandinh/room/services/Api.as left in tree.
  172. Auto-merging src/net/sandinh/room/model/LdrModel.as
  173. CONFLICT (content): Merge conflict in src/net/sandinh/room/model/LdrModel.as
  174. Removing src/net/sandinh/room/controller/SFSOnReconnectCommand.as
  175. Removing src/net/sandinh/room/controller/SFSErrorCommand.as
  176. Removing src/net/sandinh/room/controller/ReconnectCommand.as
  177. Removing src/net/sandinh/room/controller/FbShareCmd.as
  178. Removing src/net/sandinh/room/controller/ConnectionLostCommand.as
  179. Removing src/net/sandinh/room/controller/ConnectionCommand.as
  180. Removing src/net/sandinh/room/components/SDPopup.as
  181. Automatic merge failed; fix conflicts and then commit the result.
  182. Staged 'src/net/sandinh/room/model/LdrModel.as' using previous resolution.
  183. Error redoing merge 874910b2126bdf1a9aa926eeb6389b987cf8c208
  184.  
  185. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 149/278)
  186. $ git rebase --continue
  187. src/net/sandinh/room/services/Api.as: needs merge
  188. You must edit all merge conflicts and then
  189. mark them as resolved using git add
  190.  
  191. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 149/278)
  192. $ git status
  193. HEAD detached from refs/heads/phom
  194. You have unmerged paths.
  195.   (fix conflicts and run "git commit")
  196.   (use "git merge --abort" to abort the merge)
  197.  
  198. Changes to be committed:
  199.  
  200.         modified:   src/net/sandinh/room/MainContext.as
  201.         deleted:    src/net/sandinh/room/components/SDPopup.as
  202.         deleted:    src/net/sandinh/room/controller/ConnectionCommand.as
  203.         deleted:    src/net/sandinh/room/controller/ConnectionLostCommand.as
  204.         deleted:    src/net/sandinh/room/controller/FbShareCmd.as
  205.         deleted:    src/net/sandinh/room/controller/ReconnectCommand.as
  206.         deleted:    src/net/sandinh/room/controller/SFSErrorCommand.as
  207.         deleted:    src/net/sandinh/room/controller/SFSOnReconnectCommand.as
  208.         modified:   src/net/sandinh/room/model/LdrModel.as
  209.         modified:   src/net/sandinh/room/utils/SDUtils.as
  210.         deleted:    src/net/sandinh/room/view/BoardJoinView.as
  211.         deleted:    src/net/sandinh/room/view/ChatView.as
  212.         deleted:    src/net/sandinh/room/view/FindBoardView.as
  213.         deleted:    src/net/sandinh/room/view/LoadingProgress.as
  214.         deleted:    src/net/sandinh/room/view/MainButtonsView.as
  215.         deleted:    src/net/sandinh/room/view/MyUserView.as
  216.         deleted:    src/net/sandinh/room/view/RoomSelectRowView.as
  217.         deleted:    src/net/sandinh/room/view/RoomSelectView.as
  218.         deleted:    src/net/sandinh/room/view/mediators/BoardThumbMediator.as
  219.         deleted:    src/net/sandinh/room/view/mediators/MainButtonsMediator.as
  220.         modified:   src/net/sandinh/room/view/mediators/MainMediator.as
  221.         deleted:    src/net/sandinh/room/view/mediators/RoomSelectMediator.as
  222.  
  223. Unmerged paths:
  224.   (use "git add/rm <file>..." as appropriate to mark resolution)
  225.  
  226.         deleted by them: src/net/sandinh/room/services/Api.as
  227.  
  228.  
  229. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 149/278)
  230. $ git rm src/net/sandinh/room/services/Api.as
  231. src/net/sandinh/room/services/Api.as: needs merge
  232. rm 'src/net/sandinh/room/services/Api.as'
  233.  
  234. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 149/278)
  235. $ git rebase --continue
  236. [detached HEAD d092f8a] Merge remote-tracking branch 'origin/phom' into phom
  237.  Author: dungvt <dungvt@sandinh.net>
  238. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  239. Auto-merging src/net/sandinh/room/components/NativeText.as
  240. CONFLICT (content): Merge conflict in src/net/sandinh/room/components/NativeText.as
  241. Auto-merging src/net/sandinh/room/Main.as
  242. Automatic merge failed; fix conflicts and then commit the result.
  243. Staged 'src/net/sandinh/room/components/NativeText.as' using previous resolution.
  244. Error redoing merge 8398802b6dd420b38689114a370dfac5c5c87244
  245.  
  246. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 173/278)
  247. $ git rebase --continue
  248. [detached HEAD 47d194b] Merge branch 'phom' of gitlab.com:cuongdd/as-web into phom
  249.  Author: truongnx9218 <truongnx@sandinh.net>
  250. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  251. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  252. Auto-merging src/net/sandinh/room/MainContext.as
  253. CONFLICT (content): Merge conflict in src/net/sandinh/room/MainContext.as
  254. Auto-merging src/net/sandinh/room/Main.as
  255. Automatic merge failed; fix conflicts and then commit the result.
  256. Staged 'src/net/sandinh/room/MainContext.as' using previous resolution.
  257. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  258. Error redoing merge 0cf1285219fd3efafe6d5eb9d8783b51315abae5
  259.  
  260. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 179/278)
  261. $ git rebase --continue
  262. [detached HEAD 8543524] Merge branch 'phom' of gitlab.com:cuongdd/as-web into phom
  263.  Author: thangnn_sandinh <thangnn@sandinh.net>
  264. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  265. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  266. Automatic merge failed; fix conflicts and then commit the result.
  267. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  268. Error redoing merge a4ae801cd9362527f6e34dd2509ad25c9991a5c8
  269.  
  270. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 195/278)
  271. $ git rebase --continue
  272. [detached HEAD 38393f5] Merge branch 'phom' of gitlab.com:cuongdd/as-web into phom
  273.  Author: truongnx9218 <truongnx@sandinh.net>
  274. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  275. Auto-merging src/net/sandinh/room/view/mediators/LoginMediator.as
  276. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/LoginMediator.as
  277. Automatic merge failed; fix conflicts and then commit the result.
  278. Staged 'src/net/sandinh/room/view/mediators/LoginMediator.as' using previous resolution.
  279. Error redoing merge 377810b158a98c58f0102bebbe1091f696c6dda8
  280.  
  281. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 200/278)
  282. $ git rebase --continue
  283. [detached HEAD 0bddaa5] Merge branch 'phom' of bitbucket.org:cuongdd/as-web into phom
  284.  Author: Đỗ Đức Cường <cuongdd@sandinh.net>
  285. Auto-merging src/net/sandinh/room/view/mediators/LoginMediator.as
  286. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/LoginMediator.as
  287. Automatic merge failed; fix conflicts and then commit the result.
  288. Staged 'src/net/sandinh/room/view/mediators/LoginMediator.as' using previous resolution.
  289. Error redoing merge 9abfdcbf44d3cd8245d98032427213d6b794d9d2
  290.  
  291. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 209/278)
  292. $ git rebase --continue
  293. [detached HEAD 546e233] Merge remote-tracking branch 'origin/phom' into phom
  294.  Author: dungvt <dungvt@sandinh.net>
  295. Auto-merging src/net/sandinh/room/view/mediators/MainMediator.as
  296. CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainMediator.as
  297. Auto-merging src/net/sandinh/room/view/mediators/LoginMediator.as
  298. Automatic merge failed; fix conflicts and then commit the result.
  299. Staged 'src/net/sandinh/room/view/mediators/MainMediator.as' using previous resolution.
  300. Error redoing merge a8f78726f338a870dc9f90659a5707ff77ab896a
  301.  
  302. thanh@thanhbv MINGW64 /d/ohze/as-web (phom-gitlab|REBASE-i 214/278)
  303. $ git rebase --continue
  304. [detached HEAD e9784bc] Merge branch 'phom' of gitlab.com:cuongdd/as-web into phom
  305.  Author: truongnx9218 <truongnx@sandinh.net>
  306. Successfully rebased and updated refs/heads/phom-gitlab.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!