java202304java学习笔记第五十一天Your local changes to the following files would be overwritten by merge

备份本地文件

git stash  #备份工作区内容
git pull origin <branch>  #拉取远程分支
git stash pop #恢复工作区内容