5 ms·

Github has a "squash and merge" option during merging. You can disable the other options (merge, rebase) in the repo settings. I've worked with squash and merg

Github has a "squash and merge" option during merging. You can disable the other options (merge, rebase) in the repo settings. I've worked with squash and merge almost everywhere and it's great. Keeps history clean (1 commit = 1 ticket, usually), and links back to the PR with discussions and context.

gtirloni 4y ago
Unless your tickets are tiny, the single commit will have multiple functional changes and be harder to rollback. I squash my commits into functionally independent units so they make sense and can be rolled back easily. Rebase FTW.