24 lines
289 B
Markdown
24 lines
289 B
Markdown
---
|
|
title: gitpull提示stash
|
|
createTime: 2022/04/18
|
|
tags:
|
|
- git
|
|
---
|
|
|
|
## Git: pull 时提示 Please commit your changes or stash them before you merge
|
|
|
|
1. 保留本地更改
|
|
|
|
```bash
|
|
git stash
|
|
git pull
|
|
git stash pop
|
|
```
|
|
|
|
2. 不保留本地更改
|
|
|
|
```bash
|
|
git reset --hard
|
|
git pull
|
|
```
|