git pull --rebase

git reset --hard orgin/master

$ git push bit 1.8-subchannels
To git@bitbucket.org:cms.git
! [rejected] 1.8-subchannels -> 1.8-subchannels (fetch first)
error: failed to push some refs to 'git@bitbucket.orgcms.git'
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git pull bit 1.8-subchannels
remote: Counting objects: , done.
remote: Compressing objects: % (/), done.
remote: Total  (delta ), reused  (delta )
Unpacking objects: % (/), done.
From bitbucket.org:cms
* branch 1.8-subchannels -> FETCH_HEAD
e1faddc..a14be49 1.8-subchannels -> bit/1.8-subchannels
Merge made by the 'recursive' strategy.
app/controllers/subchannels_controller.rb |  +--
 file changed,  insertion(+),  deletions(-)

$ git log
commit c9f151b41286ac10656dcb8177abee1
Merge: fee23b3 a14be49
Author: w
Date: Tue Apr  ::  +

Merge branch '1.8-subchannels' of bitbucket.org:cms into 1.8-subchannels

commit fee23b36ead5ad8991097204001954b
Author: w
Date: Tue Apr  ::  +

add version to 1.2 subchannel

commit a14be49f66a5865fc6253d9f4ae655b
Author: R
Date: Tue Apr  ::  +

Fix else if syntax error

commit e1faddc216081deea2c7e80657369732c
Author: w
Date: Mon Apr  ::  +

add version to subchannel

$ git reset --hard fee23b36ead5ad899109720400
HEAD is now at fee23b3 add version to 1.2 subchannel

$ git pull --rebase bit 1.8-subchannels

$ git push bit 1.8-subchannels
Counting objects: , done.
Delta compression using up to  threads.
Compressing objects: % (/), done.
Writing objects: % (/), 1.18 KiB |  bytes/s, done.
Total  (delta ), reused  (delta )
remote:
remote: Create pull request for 1.8-subchannels:
remote: https://bitbucket.orgcms/pull-requests/new?source=1.8-subchannels&t=1
remote:
To git@bitbucket.org:cms.git
a14be49..a76e5cb 1.8-subchannels -> 1.8-subchannels