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: 5, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

$ git log
commit c9f151b41286ac10656dcb8177abee1
Merge: fee23b3 a14be49
Author: w
Date: Tue Apr 12 11:20:31 2016 +0800

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

commit fee23b36ead5ad8991097204001954b
Author: w
Date: Tue Apr 12 11:20:03 2016 +0800

add version to 1.2 subchannel

commit a14be49f66a5865fc6253d9f4ae655b
Author: R
Date: Tue Apr 12 10:48:16 2016 +0800

Fix else if syntax error

commit e1faddc216081deea2c7e80657369732c
Author: w
Date: Mon Apr 11 18:30:16 2016 +0800

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: 68, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.18 KiB | 0 bytes/s, done.
Total 12 (delta 8), reused 0 (delta 0)
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