git 常用命令

# git修改远程密码后，本地遇到Fetch failed: Authentication failed for，只需要输入以下命令，然后操作git命令就会让你输入账户和密码
git config --system --unset credential.helper

# 查看项目地址
git remote -v
# 更改项目地址
git remote set-url origin 新的git地址

# 解决线上的文件冲突
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
# 输入命令
git reset --hard FETCH_HEAD
# 然后继续pull
git pull