1.Git回滚merge操作
git reflog
d8c3069 HEAD@{6}: commit (amend): Merge branch 'dev_feature' into dev
4a0b7a9 HEAD@{7}: merge dev_feature: Merge made by the 'recursive' strategy.
3d7c80d HEAD@{8}: checkout: moving from dev_feature to dev
git reset --hard 3d7c80d
2. Git保存用户名密码
git config --global credential.helper store