Category Archives: Software Development

Squash, Merge, or Rebase?

Contents The Rebase Option Merge message for a squash merge Plumbing Commands Two years of squash merge HOW TO RESOLVE CONFLICTS These small commits help describe the process of building a feature, but can clutter your Git history after the feature is finished. Note that git merge –squash prepares the merge but does not actually