@stelepami I think I would probably not try to convert people to rebasing while on a contract. Good commit messages are something even a beginner on day 1 of using git can do, and there's not really a failure state that can't be undone with --amend. Meanwhile, merge vs rebase is a pretty technical topic that can have unsafe failure states.