rebase.sh

german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(MMC-556-Pagination) gco stable
Branch stable set up to track remote branch stable from origin.
Switched to a new branch 'stable'
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git pull origin stable
From github.com:aupeo/mmc-filter-client
 * branch            stable     -> FETCH_HEAD
Already up-to-date.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) gco master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(master) git pull origin master
remote: Counting objects: 2, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (2/2), done.
From github.com:aupeo/mmc-filter-client
 * branch            master     -> FETCH_HEAD
   5e1d9e8..b71e36a  master     -> origin/master
Updating 5e1d9e8..b71e36a
Fast-forward
 app/controllers/application_controller.rb        | 10 ++++++++++
 app/controllers/composite_stations_controller.rb |  2 +-
 app/controllers/content_providers_controller.rb  |  2 +-
 app/controllers/feeds_controller.rb              |  2 +-
 app/controllers/filter_stations_controller.rb    |  5 +++--
 app/models/api_filter.rb                         |  3 ++-
 lib/active_resource/collection_with_counter.rb   |  5 +++--
 lib/filter_resource/filter_resources.rb          | 11 ++++++++---
 lib/station_resource/station_resources.rb        |  7 ++++++-
 9 files changed, 35 insertions(+), 12 deletions(-)
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(master) gco stable
Switched to branch 'stable'
Your branch is up-to-date with 'origin/stable'.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git rebase master
First, rewinding head to replay your work on top of it...
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) gl
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git push origin stable
To [email protected]:aupeo/mmc-filter-client.git
 ! [rejected]        stable -> stable (non-fast-forward)
error: failed to push some refs to '[email protected]:aupeo/mmc-filter-client.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) st    
On branch stable
Your branch and 'origin/stable' have diverged,
and have 4 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git pull --rebase origin stable
From github.com:aupeo/mmc-filter-client
 * branch            stable     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: refs MMC-556, Implement pagination for Filter stations
Applying: refs MMC-556, Pagination; refactored filter_stations_controller; changed feeds and content_providers controllers
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) st
On branch stable
Your branch is ahead of 'origin/stable' by 2 commits.
  (use "git push" to publish your local commits)
nothing to commit, working directory clean
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git push origin stable
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 779 bytes | 0 bytes/s, done.
Total 6 (delta 4), reused 0 (delta 0)
To [email protected]:aupeo/mmc-filter-client.git
   afcb277..d95dbc1  stable -> stable
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) gl
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) gco master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(master) gl
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(master) git checkout stable
Switched to branch 'stable'
Your branch is up-to-date with 'origin/stable'.
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git push origin stable
Everything up-to-date
german@german-HP-ProBook-4540s ➜  mmc-filter-client git:(stable) git rebase master
First, rewinding head to replay your work on top of it...