git merge
[git rebase](https://texonom.com/git-rebase-4c2249c0d5e74190b525dfc5fb922e07) 


### Merge & Remove is Best

[git merge conflict](https://texonom.com/git-merge-conflict-539c494cd6d04f5aafc1363f4c8e5b6c)


[merge methods](https://texonom.com/merge-methods-00f8bd2c8a4a4a849fe12466d6ef3755)


[git merge tool](https://texonom.com/git-merge-tool-50db26382a9e4d5da3083e787c414ff4)


[merge strategy](https://texonom.com/merge-strategy-1a3b39aa1f0b4fd39cc81c9732882bbc)

### drop merge
```typegit merge --abort```

```typegit merge Bgit fetchgit merge origin/branch```
엔터하면 공통조상인 base branch에 merge commit (각각 자손브렌치에 한 커밋)
그러니 당연히 커밋 메시지 새로

```typegit fetch origin master:mastergit merge masterorgit merge branch```





