Jump to content

GIT ... how to push ?

Guest Darkhunter

Recommended Posts

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 ? :(

Link to comment
Share on other sites

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.

Link to comment
Share on other sites

  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use