/merge-vs-rebase

Show the difference between merging and merge-rebasing a PR

MIT LicenseMIT

Merge vs Rebase-merge

Show the difference between merging and merge-rebasing a PR.

  1. Push to master

  2. Merge a PR

  3. Rebase a PR

  4. Merge a PR with multiple commits

    1. first commit
    2. second commit
    3. third commit

  5. Rebase a PR with multiple commits

    1. first commit
    2. second commit
    3. third commit

  6. Squash a PR with multiple commits

    1. first commit
    2. second commit
    3. third commit