\u7576\u8981push\u7684\u6642\u5019\u767c\u751f\u4e86\u4e00\u9ede\u932f\u8aa4….<\/p>\n
\n[tdg@udnlap01 mail]$ git push -u 20141028 master\nEnter passphrase for key '\/home\/tdg\/.ssh\/id_rsa':\nTo git@cowman.no-ip.org:udn\/udn_mail_log.git\n ! [rejected] master -> master (non-fast-forward)\nerror: failed to push some refs to 'git@cowman.no-ip.org:udn\/udn_mail_log.git'\nTo prevent you from losing history, non-fast-forward updates were rejected\nMerge the remote changes before pushing again. See the 'Note about\nfast-forwards' section of 'git push --help' for details.\n<\/pre>\n\u67e5\u770bgit status\u767c\u73fe\u6c92\u6709\u554f\u984c<\/p>\n
\n[tdg@udnlap01 mail]$ git status\n# On branch master\nnothing to commit (working directory clean)\n<\/pre>\n\u57f7\u884crebase\u91cd\u65b0\u5efa\u7acb\u770b\u770b<\/p>\n
\n[tdg@udnlap01 mail]$ git rebase 20141028\ncannot rebase: you have unstaged changes\nU ftp.sh\nM ftp.sh\n<\/pre>\n\u57f7\u884cstash\u67e5\u770b\u662f\u4ec0\u9ebc\u554f\u984c<\/p>\n
\n[tdg@udnlap01 mail]$ git stash\nftp.sh: needs merge\nftp.sh: needs merge\nftp.sh: unmerged (7800202abc23a0e2d2702afd0e64f8ddec715bdf)\nftp.sh: unmerged (0e2f9d79c3e70028002bfa920d47c39b37ddbb9c)\nfatal: git-write-tree: error building trees\nCannot save the current index state\n<\/pre>\n\u9078\u64c7\u672c\u4f4e\u7aef\u7684\u7248\u672c<\/p>\n
\n[tdg@udnlap01 mail]$ git checkout --ours ftp.sh\n<\/pre>\n\u5f8c\u9762\u5c31\u4e00\u822c\u52d5\u4f5c\u63a8\u4e0a\u53bb\u4e86<\/p>\n
\n[tdg@udnlap01 mail]$ git add ftp.sh\n[tdg@udnlap01 mail]$ git commit -m \"\u4fee\u6b63mailerd\u7121\u52d5\u4f5c\u3001\u52a0\u5165SSH&SCP \"\n[master 76eedce] \u4fee\u6b63mailerd\u7121\u52d5\u4f5c\u3001\u52a0\u5165SSH&SCP\n[tdg@udnlap01 mail]$ git push -u 20141028 master\nEnter passphrase for key '\/home\/tdg\/.ssh\/id_rsa':\nCounting objects: 6, done.\nDelta compression using up to 4 threads.\nCompressing objects: 100% (4\/4), done.\nWriting objects: 100% (4\/4), 1.03 KiB, done.\nTotal 4 (delta 3), reused 0 (delta 0)\nTo git@cowman.no-ip.org:udn\/udn_mail_log.git\n d5b4793..76eedce master -> master\nBranch master set up to track remote branch master from 20141028.\n<\/pre>\n","protected":false},"excerpt":{"rendered":"\u7576\u8981push\u7684\u6642\u5019\u767c\u751f\u4e86\u4e00\u9ede\u932f\u8aa4…. [tdg@udnlap01 mail]$ git push -u 20141028 master Enter passphrase for key ‘\/home\/tdg\/.ssh\/id_rsa’: To git@cowman.no-ip.org:udn\/udn_mail_log.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘git@cowman.no-ip.org:udn\/udn_mail_log.git’ To prevent you from losing history, non-fast-forward updates were rejected Merge … Continue reading