[[email protected] sh]# git push To [email protected]:yanjing_chenl/IT-DOC.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘[email protected]:yanjing_chenl/IT-DOC.git‘ To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the ‘Note about fast-forwards‘ section of ‘git push --help‘ for details.
之前我直接在gitlab上做了改修保,而不是在本地提交的所以有问题
[[email protected] sh]# git pull remote: Counting objects: 4, done. remote: Compressing objects: 100% (4/4), done. remote: Total 4 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (4/4), done. From xx.xx.xx.x1:yanjing_chenl/IT-DOC 3152d76..75ffcb1 master -> origin/master Auto-merging sh/GUOER.SH Merge made by recursive. sh/GUOER.SH | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
再次提交问题解决:
[[email protected] sh]# git push Counting objects: 14, done. Delta compression using up to 4 threads. Compressing objects: 100% (8/8), done. Writing objects: 100% (8/8), 893 bytes, done. Total 8 (delta 4), reused 0 (delta 0) To [email protected]:yanjing_chenl/IT-DOC.git 75ffcb1..03424a3 master -> master
时间: 2024-10-18 04:40:15