Merge and rebase strategy

[baparham]

[enter opinionated territory 😉]
Hey @tobrun and @lukas-h I was just glancing at the git history, and the merge commits are getting messy. I am personally a fan of using "rebase and merge" strategies in most cases, and falling back to simple merge commits for longer running feature branches that have many commits.

What do you guys think of defaulting to Rebase and Merge as the normal case, and using normal Merge Commits in the use case for example going forward?

[lukas-h]

Yes, sorry the git history from yesterday is not very clean because of all the stuff I did with GitHub Actions..
I agree, "rebase and merge" together with PRs on GitHub should be the strategy!

[tobrun]

Rebase/Squash and merge is 👍 fwiw even disable merge commits fully in my own repositories. Even for long running feature branches that should work, I try to periodically to rebase when developing independently and if new changes land in between.

[baparham]

I updated the repo settings to support rebase and squash, and disabled merge commits for now.