日常问题之收集:Git篇(持续更新)

- [error: You have not concluded your merge (MERGE_HEAD exists)](#error-you-have-not-concluded-your-merge-merge-head-exists)
- [**warning: push.default is unset; its implicit value is changing in Git 2.0 from 'matching' to 'simple'.**](#warning-push-default-is-unset-its-implicit-value-is-changing-in-git-2-0-from-matching-to-simple)
- [Ubuntu14.04上vscode总是提示git1.9应升级到git2.0,如何做?](#ubuntu14-04上vscode总是提示git1-9应升级到git2-0,如何做?)
- [如何删除并忽略已经添加到git版本库的目录和文件](#如何删除并忽略已经添加到git版本库的目录和文件)
- [回退到过去的版本之后再如何回到未来的版本?](#回退到过去的版本之后再如何回到未来的版本?)
- [error: unable to delete BRANCH: remote ref does not exist](#error-unable-to-delete-branch-remote-ref-does-not-exist)
- [Your configuration specifies to merge with the ref 'refs/heads/dev-price'](#your-configuration-specifies-to-merge-with-the-ref-refsheadsdev-price)
- [fatal: refusing to merge unrelated histories](#fatal-refusing-to-merge-unrelated-histories)
- [git merge的撤销](#git-merge的撤销)
- [提交并推送修改到错误的分支上面](#提交并推送修改到错误的分支上面)
- [设置 Git 命令简写](#设置git命令简写)
- [Windows 下 Gitk 中文乱码](#windows下-gitk中文乱码)
Read more   2020/01/01 posted in  FAQs