As a developer creating pull requests in a git repo, you almost certainly use one of two distinct workflows for integrating changes from one branch into another: merging or rebasing. There are three key points in the development process where you need to do this:
  • apt_install_coffee@lemmy.mlEnglish
    4·
    6 months ago

    I feel like the branches we’re making and rebasing must just be less complicated than other companies, because I’ve never found the rebase process scary?

    Rebase, find the conflicts, sort them out, add the files, continue. It helps if you do so on a regular basis while working on the branch. It’s a bit involved sure, but scary?

    • thesmokingman@programming.devEnglish
      3·
      6 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.