Git Tips Slides
PageUp x2: previous · PageDown x2: next · Home: index

rebase vs merge

My default workflow:

  • While the PR is open, merge the base branch into the feature branch.
  • When the PR gets merged, squash it into one commit on main. This is usually done via the web UI.

With that workflow, I rarely need rebase.