{"id":357,"date":"2022-05-17T08:34:01","date_gmt":"2022-05-17T00:34:01","guid":{"rendered":"http:\/\/madapapa.com\/wordpress\/?p=357"},"modified":"2022-06-18T20:23:15","modified_gmt":"2022-06-18T12:23:15","slug":"git","status":"publish","type":"post","link":"http:\/\/madapapa.com\/wordpress\/?p=357","title":{"rendered":"Git"},"content":{"rendered":"

<\/span><\/a>\u57fa\u672c\u64cd\u4f5c<\/h2>\n

\u7ed1\u5b9a\u7528\u6237\u540d\u548c\u90ae\u7bb1\u5730\u5740<\/p>\n

(venv) 22-05-17\/Users\/XXXXX\/study\/watchlist~%>git --version\ngit version 2.30.1 (Apple Git-130)\n(venv) 22-05-17\/Users\/xxxxx\/study\/watchlist~%>git config --global user.nam\ne "xxxxxxx"\n(venv) 22-05-17\/Users\/xxxxx\/study\/watchlist~%>git config --global user.ema\nil "xxxxxx@outlook.com"\n<\/code><\/pre>\n
\u67e5\u770b\u672c\u5730\u5206\u652f<\/p>\n
test~%>git branch -vv\n* flask     71a338f this is a test of microblog project\n  flasktest 71a338f this is a test of microblog project\n  master    71a338f this is a test of microblog project\n<\/code><\/pre>\n
\u67e5\u770b\u8fdc\u7a0b\u5206\u652f<\/p>\n
watchlist~%>git branch -r\n  origin\/master\n<\/code><\/pre>\n
\"\"<\/p>\n
\u5220\u9664\u672c\u5730\u5206\u652f<\/p>\n
microblog\/test~%>git branch -d flasktest\nDeleted branch flasktest (was 71a338f).\n<\/code><\/pre>\n
\u67e5\u770b\u914d\u7f6e\u5217\u8868<\/p>\n
test~%>git config --list\n<\/code><\/pre>\n
remote.origin.url=git@github.com:XXXXXX\/flasktest.git\nremote.origin.fetch=+refs\/heads\/*:refs\/remotes\/origin\/*\nbranch.master.remote=origin\n<\/code><\/pre>\n
<\/span><\/a>push\u4e0epull<\/h2>\n
<\/span><\/a>push\u547d\u4ee4<\/h3>\n
push\u547d\u4ee4\u7528\u6765\u5c06\u8fdc\u7a0b\u5206\u652f\u5185\u5bb9\uff0c\u62c9\u53d6\u5230\u672c\u5730\u5206\u652f\u4e0a\uff0c\u5f53\u8fdc\u7a0b\u5206\u652f\u548c\u672c\u5730\u5206\u652f\u540d\u79f0\u4e00\u81f4\u65f6\uff0c\u53ef\u4ee5\u7701\u7565\u672c\u5730\u5206\u652f\u540d\u79f0\uff0cpush\u547d\u4ee4\u4e2d\u7684origin\u4f1a\u8ba9\u4eba\u5f88\u7591\u60d1<\/p>\n
pull\u547d\u4ee4<\/p>\n
push\u4e0epull\u547d\u4ee4\u53c2\u8003<\/a><\/p>\n
<\/span><\/a>\u5efa\u7acb\u6216\u5220\u9664\u672c\u5730\u5e93\u4e0e\u8fdc\u7a0b\u5e93\u7684\u7ed1\u5b9a<\/h2>\n
\u5efa\u7acb\u672c\u5730\u5e93\u4e0e\u8fdc\u7a0b\u5e93\u7684\u7ed1\u5b9a\u5173\u7cfb\uff0c\u548c\u8fdc\u7a0b\u5e93\u8fdb\u884c\u7ed1\u5b9a\u65f6\uff0c\u9700\u8981\u7ed9\u8fdc\u7a0b\u5e93\u4e00\u4e2a\u540d\u5b57\uff0c\u4e00\u822c\u6765\u8bf4origin\u5c31\u662f\u9ed8\u8ba4\u7684\u540d\u79f0<\/p>\n
xxx\/flasky\/watchlist~%>git remote add origin git@github.com:xxx\/watchlist.git\n<\/code><\/pre>\n
\u5220\u9664\u672c\u5730\u5e93\u548c\u8fdc\u7a0b\u5e93\u7684\u7ed1\u5b9a\uff0c\u6ce8\u610f\u8fd9\u91cc\u53ea\u662f\u5220\u9664\u4e86\u672c\u5730\u5e93\u4e0e\u8fdc\u7a0b\u5e93\u4e4b\u95f4\u7684\u6620\u5c04\u5173\u7cfb\uff0c\u5e76\u6ca1\u6709\u771f\u7684\u5220\u9664\u4efb\u4f55\u7269\u7406\u5185\u5bb9\u3002<\/p>\n
xxx\/flasky\/watchlist\/watchlist~%>git remote rm origin\nxxx\/flasky\/watchlist\/watchlist~%>git remote -v\n<\/code><\/pre>\n
\u5982\u679c\u6709\u7ed1\u5b9a\u7684\u8fdc\u7a0b\u5e93\uff0c\u547d\u4ee4\u201cgit remote -v\u201d\u4f1a\u663e\u793a\u5982\u4e0b
\n\"\"
\n\u73b0\u5728\u56e0\u4e3a\u6211\u4f7f\u7528git remote rm origin\u547d\u4ee4\u5220\u9664\u4e86\u7ed1\u5b9a\u5173\u7cfb\uff0c\u5219git remote -v\u4ec0\u4e48\u90fd\u4e0d\u4f1a\u663e\u793a\uff0c\u56e0\u4e3alinux\u7684\u6700\u5927\u7406\u5ff5\u5c31\u662f\uff0c\u201c\u6ca1\u6709\u6d88\u606f\u5c31\u662f\u597d\u6d88\u606f\u201d\ud83d\ude0a<\/p>\n
<\/span><\/a>fatal: refusing to merge unrealated histories<\/h2>\n
xxxx\/flasky\/watchlist~%>git pull origin master\nFrom https:\/\/github.com\/xxxx\/watchlist\n * branch            master     -> FETCH_HEAD\nfatal: refusing to merge unrelated histories\n<\/code><\/pre>\n
The \u201cfatal: refusing to merge unrelated histories\u201d Git error occurs when two unrelated projects are merged, and two projects are unaware of each other existence and having mismatch commit histories.
\n\"\"
\nTo provide a little background .git directory, which is usually hidden, contains all the changes or \u201ccommits\u201d of the repo that gets tracked. Rewriting the repository history is possible, but it\u2019s generally not the typical use case. Git is used for version control, which means to track the history of the file.<\/p>\n
Use Cases that lead to git fatal: refusing to merge unrelated histories<\/p>\n
If you have cloned a repository and, for some reason, the .git folder is corrupted or deleted. Since git will be unaware of your local history, any action you perform like git pull or git push to remote repository will throw this error as there is no tracking information for the current branch.
\nYou have created a new repository, made few commits to it, and now try to pull a remote repository that already has its own commits. Git will throw an error here since it is unaware of how these two projects and commits are related.<\/p>\n
<\/span><\/a>The solution to Refusing to merge unrelated histories<\/h3>\n
The error started occurring from git version 2.9.0 release notes and above. To solve this issue –allow-unrelated-histories flag when pulling the data from remote repository.<\/p>\n
\u89e3\u51b3unrelated histories\u95ee\u9898\u53c2\u8003<\/a><\/p>\n
<\/span><\/a>\u5168\u6d41\u7a0b\u6982\u8981<\/h2>\n