| ▲ | eastbound 4 days ago | |
Squashed PR allow you to see a single commit, while rebased PRs show up as multiple. The squash has the defect that you can’t rebase PRs that were on top. But a MERGE… is a single commit on Master, while keeping the detailed history! - We just don’t use the merge because they are ugly, - And they’re only ugly because the visualizers make them ugly. It’s a tooling problem. The merge is the correct implementation. (and yet I use the rebase-fast-forward). | ||
| ▲ | thfuran 4 days ago | parent [-] | |
You can squash after rebasing or merge a PR without squashing. | ||