IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第1張

報錯:

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第2張

 

処理方法:

terminal,輸入:

git merge --allow-unrelated-histories

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第3張

  搞定。

2. 其他情況:有文件沖突,比如:

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第4張

  那我們繼續:找到這個 README.MD ,右鍵-git-resolve Conflicts , Accept Theirs,如果你覺得你的好,就Accept Yours。

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第5張

 

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第6張

 

3. idea Commit,顯示成功,就對了。 All files are up-to-date~~

IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法,第7張

 



生活常識_百科知識_各類知識大全»IDEA git pull時報錯:fatal: refusing to merge unrelated histories的処理方法

0條評論

    發表評論

    提供最優質的資源集郃

    立即查看了解詳情