合并代码

优秀文章：

• https://www.kingname.info/2020/09/13/how-to-reslove-conflict/
• https://www.kingname.info/2020/09/13/how-to-reslove-conflict/

git stash合并代码

1. 进入目标仓库

cd pages/timeline

2. 查看并切换目标分支

git branch

git checkout dev_release

3. 提交本地代码

git add .
git commit -m "feat: init"

4. 隐藏本地代码（回滚到仓库原始状态）

git stash

5. 拉去远程仓库代码

git pull

6. 显示本地代码

git stash pop

7. 根据CONFLICT提示,定位冲突文件,合并最新代码

实例

xinjianan@xinjianandeMac-mini timeline % git stash pop
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Auto-merging src/client/mobile/event/layout/Main/index.jsx
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
The stash entry is kept in case you need it again.