Git is great. It just needs a little understanding.

gistfile1.txt

vmm (fr8_1_sme-FR-58)$ git push
To github.com:ChasManRors/vmm.git
 ! [rejected]              fr8_1_sme-FR-58 -> fr8_1_sme-FR-58 (non-fast-forward)
error: failed to push some refs to '[email protected]:ChasManRors/vmm.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.


vmm (fr8_1_sme-FR-58_SAVED3)$ git push -u origin fr8_1_sme-FR-58_SAVED3:fr8_1_sme-FR-58
To github.com:ChasManRors/vmm.git
 ! [rejected]              fr8_1_sme-FR-58_SAVED3 -> fr8_1_sme-FR-58 (non-fast-forward)
error: failed to push some refs to '[email protected]:ChasManRors/vmm.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.