• Dandroid
    link
    fedilink
    72 years ago

    I always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.

    • @charliespider
      link
      42 years ago

      We squash when merging. Final git history is super clean and linear.