Because of conflicts, I can’t do anything, such as git push, git check ant etc.
root@ubuntu:/home/gongya/indeni/indeni-knowledge/parsers/src/checkpoint# git push
Password for ‘https://email@example.com’:
! [rejected] IKP-1492-chkp-os-cphaconf_show_bond-linu -> IKP-1492-chkp-os-cphaconf_show_bond-linu (non-fast-forward)
error: failed to push some refs to ‘https://firstname.lastname@example.org/indeni/indeni-knowledge.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.