1.git更新失败Your local changes would be overwritten by merge.Commit, stash or revert them to proceed.
https://blog.csdn.net/G721k/article/details/118679998
git stash //暂存当前正在进行的工作。
git pull //拉取服务器的代码
git stash pop //合并暂存的代码
2.启动Application端口被占用:
https://blog.csdn.net/m0_53640372/article/details/126553547
a.在cmd中断执行(9002为被占用端口号): netstat -aon |findstr "9002"
b.kill掉相应进程(21416为相应端口的进程): taskkill /pid 21416 /f
3.D:\code\yms-report-service\report-service-admin\src\main\resources\static
D:\Users\liangboling1\AppData\Roaming\npm\node_modules\npm\node_modules\osenv\osenv.js:49
2.error: Pulling is not possible because you have unmerged files
https://blog.csdn.net/mango_love/article/details/87261529
//注释:提交本地代码到工作区
//注释:如果有冲突,先解决冲突合并代码,然后提交
//注释:如果代码上没有冲突,但是提交的时候git提醒有冲突,那么先关闭编辑器,然后编译代码找到冲突,最后手动合并代码解决冲突
git add .
git commit -m '提交本地代码并且获取最新代码'
//注释:获取源dev分支最新代码
git pull origin dev
//注释:如有冲突就解决冲突
3.git切换分支时,如何干净的切换到另一个分支上?
https://blog.csdn.net/weixin_45294340/article/details/116016254
git stash
git checkout develop
4.解决:git SSL certificate problem: unable to get local issuer certificate
https://blog.csdn.net/weixin_44014995/article/details/109900149
执行下面命令就可以解决:git config --global http.sslVerify false