Anyone can help to resolve the git conflicts

Indeni
#1

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 protected]’:
To https://bitbucket.org/indeni/indeni-knowledge.git
! [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://[email protected]/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.

#2

Hi, Gongya,

I am checking who can help you with this issue.

#3

thanks so much for help!

#4

Hi, @Hawkeye_Parker

Please see if you can help @gongya with his GIT issue.
If needed, I will get @Alon_Ashkenazi involved tomorrow morning.

#5

Gongya, IKL related issues should be posted to the IKL forum, not Indeni. Looks like @Hawkeye_Parker is helping you with this ticket.

#6

thanks !! I got an email from him. I will give a try .

#7

@gongya You should do git pull from the branch that you are trying to push to, resolve the conflict and then push your changes

#8

I think I messed up.

Git pull does not work.

#9

I’m helping gongya with this. We will get it sorted out – not a straightforward issue.

#10

@Hawkeye_Parker @gongya LMK if you need additional help

#11

Hawyeke helped me out!

Thanks!

Gongya Yu