git

$ git add ch6_validate_benchmark_osp.adoc
[rlopez@rlopez-fedora project-osp-scale]$ git add ch4_rhel_osp_configuration.adoc
[rlopez@rlopez-fedora project-osp-scale]$ git commit -m "adding new version" 
[master f102741] adding new version
 2 files changed, 5 insertions(+), 4 deletions(-)
[rlopez@rlopez-fedora project-osp-scale]$ git push
warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:

  git config --global push.default matching

To squelch this message and adopt the new behavior now, use:

  git config --global push.default simple

When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.

In Git 2.0, Git will default to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.

See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)

To gitosis@se-apps.cloud.lab.eng.bos.redhat.com:paper-review
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'gitosis@se-apps.cloud.lab.eng.bos.redhat.com:paper-review'
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.
[rlopez@rlopez-fedora project-osp-scale]$ git pull
Auto-merging project-osp-scale/ch6_validate_benchmark_osp.adoc
Auto-merging project-osp-scale/ch4_rhel_osp_configuration.adoc
Merge made by the 'recursive' strategy.
 project-osp-scale/OSP-Scale-RA-Title.adoc         |  1 +
 project-osp-scale/ch1execsummary.adoc             |  1 +
 project-osp-scale/ch2refarchenv.adoc              |  1 +
 project-osp-scale/ch3refarchconfig.adoc           |  1 +
 project-osp-scale/ch4_rhel_osp_configuration.adoc |  1 +
 project-osp-scale/ch5_ahc.adoc                    |  1 +
 project-osp-scale/ch6_rhel_osp6_deployment.adoc   |  1 +
 project-osp-scale/ch6_validate_benchmark_osp.adoc |  1 +
 project-osp-scale/ch7_osp_benchmark_results.adoc  |  1 +
 project-osp-scale/ch8_conclusion.adoc             |  1 +
 project-osp-scale/ch9_appendix.adoc               |  1 +
 project-osp-scale/commentsfeedback.adoc           |  1 +
 project-osp-scale/troubleshoot.adoc               | 26 ++++++++++++++++++++++++++
 13 files changed, 38 insertions(+)