ผม push ไปแล้วเกิด error ครับ
แล้วก็ใช้ git pull ตามที่มันบอก แล้วลอง push ใหม่ก็ได้แล้วครับ มันเกิดอะไรขึ้นหรอครับผม
root@99216425fe76:/workspace/my-update# git push -u origin master Username for 'https://git.cils.space': ice Password for 'https://ice@git.cils.space': To https://git.cils.space/ice/my-update.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://git.cils.space/ice/my-update.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
root@99216425fe76:/workspace/my-update# git pull remote: Counting objects: 12, done. remote: Compressing objects: 100% (8/8), done. remote: Total 12 (delta 6), reused 9 (delta 4) Unpacking objects: 100% (12/12), done. From https://git.cils.space/ice/my-update a209c12..8ca901d master -> origin/master Auto-merging CHANGELOG.md CONFLICT (content): Merge conflict in CHANGELOG.md Automatic merge failed; fix conflicts and then commit the result.