• Dandroid
    link
    fedilink
    71 year 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
      41 year ago

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