GIT ... how to push ?

[Darkhunter]

Hello I have my own GIT MaNGOS REPO in http://github.com/Darkhunter/Tranquillien-HCRP-Project/tree/

and I added one commiter who tried if he can commit...

and now I can´t push....

it writes me :

To prevent you from losing history, non-fast-forward updates were rejected

Merge the remote changes before pushing again. See the 'non-fast forward'

section of 'git push --help' for details.

Pushing to [email protected]:Darkhunter/Tranquillien-HCRP-Project.git

To [email protected]:Darkhunter/Tranquillien-HCRP-Project.git

! [rejected] master -> master (non-fast forward)

error: failed to push some refs to '[email protected]:Darkhunter/Tranquillien-HCRP-Project.git'

then I do in GIT BASH command: git merge HEAD or git merge master

it writes already up-to-date ... but it isn´t....

what to do ?

[Diablox]

Since you were using git merge try git rebase to check is everything where you want it to be

[Darkhunter]

when I do git rebase --preserve:

Error: needed a single revision

invalid upstream

[Diablox]

Sorry i mixed up git fetch and git merge. Use git fetch origin master and then git rebase

[Darkhunter]

git rebase -f master

Current branch master is up to date, rebase forced.

First, rewinding head to replay your work on top of it.

Fast-forwared master to master

and writes the same error when push

[Darkhunter]

okay.. I deleted that repo.. and cloned second one... I pushed the second one.. but I can´t pull it into server... it writes:

error: Entry 'src/bindings/ScriptDev2/ScriptMgr.h' not uptodate. Cannot merge.

please help

[xeross155]

okay.. I deleted that repo.. and cloned second one... I pushed the second one.. but I can´t pull it into server... it writes:

error: Entry 'src/bindings/ScriptDev2/ScriptMgr.h' not uptodate. Cannot merge.

please help

Means you changed ScriptMgr.h on your server and that you haven't committed it yet.

[Patman128]

All your error means is that you need to pull from it before pushing again. Just use git pull. That's all you should need to do (aside from manually merging it if it fails)

[xeross155]

All your error means is that you need to pull from it before pushing again. Just use git pull. That's all you should need to do (aside from manually merging it if it fails)

He's having a problem pulling the branch not pushing it.

[Patman128]

He's having a problem pulling the branch not pushing it.

I was referring to his original problem, but I guess it isn't the problem anymore.