• thesmokingman@programming.dev
    link
    fedilink
    English
    arrow-up
    3
    ·
    10 months ago

    I too have never really found rebasing to be super complicated. I was initially intimidated because people told me to be intimidated. Turns out it’s just like any other commit with possible merge conflicts. Real basic. Just as long as you don’t force push to your remote you even have unlimited retries!

    I wonder if it’s a CLI vs GUI thing. I wouldn’t want to touch a rebase in GitHub and the VS Code merge editor always trips me up but I feel very comfortable with the command line. I also regularly do patch adds to keep my individual commits atomic. I could definitely see someone uncomfortable with all of that work trying to do their first rebase and getting frustrated with the CLI learning curve then passing that on as rebase fear.