Devs, I see a lot of merge master to branch commits appearing on PRs. This is against prior (non-hard) agreements on how we work. It is getting to be the daily practice so; How do we feel about 1. not using merge commits anymore? 2. merging back as a way of solving conflicts? and Do we need to make a policy of it or do we let it evolve, at the risk of having more hard to track feature/version matrices?
-- Daan
