Hi On 01/08/2018 10:45 AM, Daan Hoogland wrote: > 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?
I am +1 merge commits (when it make sense). Keep history and be able to identify which commits belongs to what PR. Also helpful if there are more than one author. It also helps when the PR contains commit with fixes which can be cherry picked and backported (e.g. the systemvm PR as an example). Merge commits are not bad if we used them correctly. However, merge commits in PRs -> bad I am -1 "always squash commits". Source code is write once read many, splitting commits into multiple commits can help understand the code. René
