Mac@programming.dev to Git@programming.dev · 9 months ago[Julia Evans] Combining Branchesprogramming.devimagemessage-square11fedilinkarrow-up171arrow-down11file-text
arrow-up170arrow-down1image[Julia Evans] Combining Branchesprogramming.devMac@programming.dev to Git@programming.dev · 9 months agomessage-square11fedilinkfile-text
minus-squareamio@kbin.sociallinkfedilinkarrow-up5·9 months agoI’ve tended to rebase before anything else. If I feel unsure about the massive interactive rebase fuckery I’m about to embark on, I just make another branch where I start. Then undoing it’s fairly trivial.
![[Julia Evans] Combining Branches](https://programming.dev/pictrs/image/0fe7c7bd-b762-453f-bac7-ed2e34d44ba0.png){kind=link}
I’ve tended to rebase before anything else. If I feel unsure about the massive interactive rebase fuckery I’m about to embark on, I just make another branch where I start. Then undoing it’s fairly trivial.