I am getting the below error when trying to push:
git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin master:master
Pushing to https://github.com/Registria/Data-Services.git
To https://github.com/Registria/Data-Services.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/Registria/Data-Services.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.
Completed with errors, see above.
I am getting the below error when trying to pull:
git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
Completed with errors, see above.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.