Time Nick Message 12:42 MTDiscord Oh no, squashing is so dang helpful, that, and no merge commits (in my experience) 12:46 MTDiscord Should I edit the history to remove the merge commit then? 13:01 MTDiscord squash + rebase should preferrably be done with PRs 13:01 MTDiscord results in a tidier commit history 13:14 MTDiscord Didn't we have this discussion already? 13:16 MTDiscord https://github.com/minetest/minetest_docs/issues/19 13:18 MTDiscord We can change the already loose policy, but we should aim for some consistency 17:04 MTDiscord Don't bother editing history, no one reads past the last like 10. But yes squash and rebase on merge. Preferably submitter does the rebase