• @charliespider
    link
    321 year ago

    Rebase all of your work branches onto HEAD so that conflicts require refactoring the first commit where things don’t match up. This can make conflicts easier to deal with (in my humble opinion) since you deal with conflicts earlier in your commit history as opposed to at the end after ALL of your changes are made.

    Plus a linear history is super nice to work with later on.

    • 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.