Mac@programming.dev to Git@programming.dev · 1 year ago[Julia Evans] Combining Branchesprogramming.devimagemessage-square1fedilinkarrow-up11arrow-down10file-text
arrow-up11arrow-down1image[Julia Evans] Combining Branchesprogramming.devMac@programming.dev to Git@programming.dev · 1 year agomessage-square1fedilinkfile-text
minus-squaredudinax@programming.devlinkfedilinkarrow-up1·1 year agoMerge. One of the values of a VCS is to preserve history in detail, and merge is the only method that does that. Also, it’s easy to foul a remote branch with the other methods if someone has already pushed changes to branch 1.
![[Julia Evans] Combining Branches](https://programming.dev/pictrs/image/0fe7c7bd-b762-453f-bac7-ed2e34d44ba0.png){kind=link}
Merge. One of the values of a VCS is to preserve history in detail, and merge is the only method that does that. Also, it’s easy to foul a remote branch with the other methods if someone has already pushed changes to branch 1.