git rebase as-core

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab)
$ git rebase --keep-empty --preserve-merges --onto tienlen cb8c97d07a6e8053ff45138952654df66d1983a6 phom-gitlab
Auto-merging src/net/sandinh/room/view/TopView.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/TopView.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/TopView.as' using previous resolution.
Error redoing merge bf4fb4a83304f6a89303d5093753a6b38cbc4d24

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 28/300)
$ git rebase --continue
[detached HEAD 18128646] Merge remote-tracking branch 'origin/phom' into phom
 Author: dungvt <dungvt@sandinh.net>
Auto-merging src/net/sandinh/room/view/TopView.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/TopView.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/TopView.as' using previous resolution.
Error redoing merge 0d08fd578c42a29f2e47f9e8f433499f76dc1c2f

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 36/300)
$ git rebase --continue
[detached HEAD 5e1a64e3] Merge remote-tracking branch 'origin/phom' into phom
 Author: dungvt <dungvt@sandinh.net>
Auto-merging src/net/sandinh/room/view/mediators/MainButtonsMediator.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MainButtonsMediator.as
Auto-merging src/net/sandinh/room/view/MainButtonsView.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/MainButtonsView.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/MainButtonsView.as' using previous resolution.
Staged 'src/net/sandinh/room/view/mediators/MainButtonsMediator.as' using previous resolution.
Error redoing merge 462de96e0e1410d35ab9fb7b3612f9a4e4569013

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 66/300)
$ git rebase --continue
[detached HEAD f00db3aa] Merge remote-tracking branch 'origin/phom' into phom
 Author: Đỗ Đức Cường <cuongdd@sandinh.net>
Auto-merging src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as
Auto-merging src/net/sandinh/room/view/ZoneSelectionView.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/ZoneSelectionView.as
Removing src/net/sandinh/room/signals/VisibleMenuButtonSignal.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/ZoneSelectionView.as' using previous resolution.
Error redoing merge 6ac8d4f3355ba6884405bda2fba5637f61dfbae1

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 86/300)
$ git rebase --continue
[detached HEAD 22112a32] Merge Code | Conflicts |       src/net/sandinh/room/view/ZoneSelectionView.as
 Author: truongnx9218 <truongnx@sandinh.net>
Auto-merging src/net/sandinh/room/view/ZoneSelectionView.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/ZoneSelectionView.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/ZoneSelectionView.as' using previous resolution.
Error redoing merge 5bdef69ad751b7d42dae752adcfdd7cd02eb1a27

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 114/300)
$ git rebase --continue
[detached HEAD b1f52516] Merge branch 'phom' of gitlab.com:cuongdd/as-core into phom
 Author: truongnx9218 <truongnx@sandinh.net>
Auto-merging src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as' using previous resolution.
Error redoing merge 621ea33b24c6a7f88a9aae1e22fb12082d327e7b

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 137/300)
$ git rebase --continue
[detached HEAD bdcd54a0] Merge branch 'phom' of gitlab.com:cuongdd/as-core into phom
 Author: thangnn_sandinh <thangnn@sandinh.net>
Auto-merging src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/mediators/ZoneSelectionMediator.as' using previous resolution.
Error redoing merge a5f3b5d9c979b229d9f32344fd18502a04979790

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 138/300)
$ git rebase --continue
[detached HEAD 44d6e8d0] Merge remote-tracking branch 'origin/phom' into phom
 Author: Đỗ Đức Cường <cuongdd@sandinh.net>
Auto-merging src/net/sandinh/room/view/mediators/LoginMediator.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/LoginMediator.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/mediators/LoginMediator.as' using previous resolution.
Error redoing merge c205e056b87ed97920c11dedb619cc3aba68e12a

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 210/300)
$ git rebase --continue
[detached HEAD 6f888f61] Merge branch 'phom' of gitlab.com:cuongdd/as-core into phom
 Author: Xuan Truong <truongnx@sandinh.net>
interactive rebase in progress; onto 3a0624cb
Last commands done (213 commands done):
   pick 7761029e change onForgotPass in LoginMediator
   pick 62f5b588 Fixbug merge code
Next commands to do (87 remaining commands):
   pick bcdf5346 Move MainButtonView to As-Mobile Move MainButtonMediator to As-Core
   pick 5af30558 Merge branch 'phom' of gitlab.com:cuongdd/as-core into phom
You are currently rebasing branch 'phom-gitlab' on '3a0624cb'.

nothing to commit, working tree 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'
Could not pick 62f5b588fd2dcfa5e57cdf7e289097bfac45b36c

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 213/300)
$  git commit --allow-empty
[detached HEAD 9d3fb84f] Fixbug merge code
 Author: Xuan Truong <truongnx@sandinh.net>
 Date: Fri Sep 9 11:48:19 2016 +0700

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 213/300)
$ git rebase --continue
Auto-merging src/net/sandinh/room/view/mediators/MyUserMediator.as
CONFLICT (content): Merge conflict in src/net/sandinh/room/view/mediators/MyUserMediator.as
Auto-merging src/net/sandinh/room/view/TopView.as
Auto-merging src/net/sandinh/room/view/TermView.as
CONFLICT (add/add): Merge conflict in src/net/sandinh/room/view/TermView.as
Removing src/net/sandinh/room/view/MainButtonsView.as
Removing src/net/sandinh/room/controller/FbShareCmd.as
Automatic merge failed; fix conflicts and then commit the result.
Staged 'src/net/sandinh/room/view/TermView.as' using previous resolution.
Staged 'src/net/sandinh/room/view/mediators/MyUserMediator.as' using previous resolution.
Error redoing merge 0aab06e31091bac5d0825b5f5d53614f72b9ce20

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab|REBASE-i 223/300)
$ git rebase --continue
[detached HEAD 72464d47] Merge remote-tracking branch 'origin/phom' into phom
 Author: dungvt <dungvt@sandinh.net>
Successfully rebased and updated refs/heads/phom-gitlab.

thanh@thanhbv MINGW64 /d/ohze/as-core (phom-gitlab)