gistfile1.txt

[root@localhost] oars/tests/features # git pull origin builder
remote: Counting objects: 306, done.
remote: Compressing objects: 100% (45/45), done.
remote: Total 247 (delta 199), reused 247 (delta 199)
Receiving objects: 100% (247/247), 32.97 KiB, done.
Resolving deltas: 100% (199/199), completed with 33 local objects.
From github.com:nashape/oars
 * branch            builder    -> FETCH_HEAD
Updating 9c73dc2..1d8bf17
Fast-forward
 controllers/ClustersController.php      |    9 +++-
 controllers/FormsController.php         |   82 ++++++++++++++++++++++---------
 controllers/TestsController.php         |   17 ++++--
 controllers/UnitsController.php         |    8 +++-
 views/clusters/add.html.php             |    2 +-
 views/clusters/edit.html.php            |    2 +-
 views/elements/parents_partial.html.php |   16 +++---
 views/forms/add.html.php                |   23 ++++++++-
 views/forms/edit.html.php               |    6 +-
 views/tests/add.html.php                |    2 +-
 views/tests/edit.html.php               |    2 +-
 webroot/css/forms.css                   |    1 +
 12 files changed, 122 insertions(+), 48 deletions(-)
[root@localhost] oars/tests/features # git push                                                                                                                                                                                                                              17:02
To [email protected]:nashape/oars.git
 ! [rejected]        delivery -> delivery (non-fast-forward)
 ! [rejected]        dev -> dev (non-fast-forward)
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:nashape/oars.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
[root@localhost] oars/tests/features #