# Git pull merge
###### tags:`想知道嗎`, `Git`
---
<!--  -->
Sarah 🐘Vegelephant 🐘
蔬食-環保-玩小孩
past: Python
now : PHP
fb id:100001561720922
---
### 併
* WHY
* WHAT
* HOW
---
## Merge
merging B into A, checkout A
---
## Pull = Fetch + Merge
---
## Merge
 
---
## Rebase
 
---
## Conflict
```
<<<<<<< HEAD
ours (當前branch的內容) (要rebase的目標)
=======
theirs (要Merge的) (當前branch的內容)
>>>>>>> branch-a
```
---
`git checkout --ours codefile.js`
`git checkout --theirs codefile.js`
---
{"metaMigratedAt":"2023-06-15T01:37:05.298Z","metaMigratedFrom":"YAML","title":"Git pull merge","breaks":true,"slideOptions":"{\"transition\":\"slide\"}","contributors":"[{\"id\":\"0f4b2677-c241-45c8-bc6c-45fe527d2921\",\"add\":2277,\"del\":1339}]"}