git问题处理

---

Q1

fatal: remote origin already exists.

git remote rm origin

---

Q2

取消文件跟踪

git rm -r --cached [filename]

---

Q3

fatal: refusing to merge unrelated histories

git pull origin master --allow-unrelated-histories

---

Q4

git log查看分支图

git log --oneline --decorate --graph --all

Q5

查看跟踪的文件

git ls-files

Q6

Please move or remove them before you can merge

git reset --hard HEAD