Merge & Remove is Bestgit merge usagesgit merge conflictmerge methodsgit merge toolmerge strategydrop merge 엔터하면 공통조상인 base branch에 merge commit (각각 자손브렌치에 한 커밋)그러니 당연히 커밋 메시지 새로 Git ThingsA grab bag of less frequently talked about git adjacent points.https://matklad.github.io/2023/12/31/git-things.html