vuepress-theme-plume/examples/blog/docs/notes/Git/2022-04-18.md

title, createTime, tags, categories

title	createTime	tags	categories
gitpull提示stash	2022/04/18	git	随记

Git: pull 时提示 Please commit your changes or stash them before you merge

1. 保留本地更改

git stash
git pull
git stash pop

2. 不保留本地更改

git reset --hard
git pull