\u7576\u9032\u884c gir push \u767c\u751f “non-fast-forward” \u932f\u8aa4\u6642 (\u5982\u4e0b\u9762\u9019\u500b\u7bc4\u4f8b)<\/p>\n
root@ubuntu:\/mnt\/tdg_logs\/blacklist\/Git\/master# git push -u 20140821 master\nEnter passphrase for key '\/root\/.ssh\/id_rsa': \nTo git@cowman.no-ip.org:udn\/udn_php-domain_name_query.git\n ! [rejected] master -> master (non-fast-forward)\nerror: failed to push some refs to 'git@cowman.no-ip.org:udn\/udn_php-domain_name_query.git'\nTo prevent you from losing history, non-fast-forward updates were rejected\nMerge the remote changes (e.g. 'git pull') before pushing again. See the\n'Note about fast-forwards' section of 'git push --help' for details.<\/pre>\n\u6703\u6709\u5e7e\u500b\u53ef\u80fd\u6027, \u53ef\u4ee5\u900f\u904e git status <\/code> \u5148\u67e5\u770b\u662f\u4e0d\u662f\u6709\u9700\u8981\u624b\u52d5 merge \u7684\u90e8\u5206
\n\u5047\u8a2d\u6709\u51fa\u73fe Unmerged paths \u7684\u8cc7\u8a0a\u5c31\u662f\u9700\u8981\u624b\u52d5\u8655\u7406\u4e00\u4e0b<\/p>\n\nroot@ubuntu:\/mnt\/tdg_logs\/blacklist\/Git\/master# git status\n# On branch master\n# Unmerged paths:\n# (use \"git add\/rm ...\" as appropriate to mark resolution)\n#\n# both added: JobDaemon.php\n# both added: ReadME\n# both added: daily.sh\n#\n# Untracked files:\n# (use \"git add ...\" to include in what will be committed)\n#\n# 20140801\/\n# 20140815.zip\n# 20140821.zip\n# JobDaemon.php.bak\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")\n<\/pre>\n\u9019\u6642\u5019\u5c31\u8981\u91dd\u5c0d JobDaemon.php\u3001ReadME\u3001daily.sh \u9032\u884c\u7de8\u8f2f
\n\u5728\u6a94\u6848\u4e2d\u53ef\u4ee5\u770b\u5230<\/p>\n
\n<<<<<<<<<< HEAD \n\u8981\u65b0\u63a8\u4e0a\u53bb\u7684\u6a94\u6848\u5167\u5bb9\n==========\n\u539f\u59cbbranch\u7684\u6a94\u6848\u5167\u5bb9\n>>>>>>>>>>>\n<\/pre>\n\u76ee\u524d\u662f\u5148\u4fdd\u7559\u65b0\u63a8\u4e0a\u53bb\u7684\u6a94\u6848\u5167\u5bb9\u70ba\u4e3b~\u5c07<<<\u3001===\u3001\u539f\u59cb\u7684\u5167\u5bb9\u3001>>>\u522a\u9664\u5f8c\u91cd\u65b0 git add\u3001git commit<\/code> \u5f8c\u91cd\u65b0push\u5373\u53ef<\/p>\n\u53e6\u5916\u4e00\u500b\u53ef\u80fd\u6027\u662f\u8981\u9032\u884c git pull \u8981\u63a8\u4e0a\u53bb\u7684remote \u8981\u63a8\u5230\u7684branch\u540d\u7a31<\/code><\/p>\n \nroot@ubuntu:\/mnt\/tdg_logs\/blacklist\/Git# git pull 20140825 master\nEnter passphrase for key '\/root\/.ssh\/id_rsa': \nwarning: no common commits\nremote: Counting objects: 18, done.\nremote: Compressing objects: 100% (17\/17), done.\nremote: Total 18 (delta 7), reused 0 (delta 0)\nUnpacking objects: 100% (18\/18), done.\nFrom cowman.no-ip.org:udn\/udn_php-domain_name_query\n * branch master -> FETCH_HEAD\nMerge made by the 'recursive' strategy.\nroot@ubuntu:\/mnt\/tdg_logs\/blacklist\/Git# git push 20140825 master\nEnter passphrase for key '\/root\/.ssh\/id_rsa': \nCounting objects: 2, done.\nDelta compression using up to 4 threads.\nCompressing objects: 100% (2\/2), done.\nWriting objects: 100% (2\/2), 305 bytes, done.\nTotal 2 (delta 1), reused 0 (delta 0)\nTo git@cowman.no-ip.org:udn\/udn_php-domain_name_query.git\n 07152a6..ccd7420 master -> master\n <\/pre>\n","protected":false},"excerpt":{"rendered":"\u7576\u9032\u884c gir push \u767c\u751f “non-fast-forward” \u932f\u8aa4\u6642 (\u5982\u4e0b\u9762\u9019\u500b\u7bc4\u4f8b) root@ubuntu:\/mnt\/tdg_logs\/blacklist\/Git\/master# git push -u 20140821 master Enter passphrase for key ‘\/root\/.ssh\/id_rsa’: To git@cowman.no-ip.org:udn\/udn_php-domain_name_query.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘git@cowman.no-ip.org:udn\/udn_php-domain_name_query.git’ To prevent you from losing history, … Continue reading