I’m a bit unclear on terms and actions. If you have a PR on GitHub that is up to date with master and you press the “merge” button do you get a merge commit?
I’m definitely against anything that results in non-linear history on a branch, and would support anything that enforces this. I’ve looked for a description of of the camel git workflow and haven’t been able to find any documentation. David Jencks > On Apr 15, 2020, at 1:09 PM, Pascal Schumacher <pascalschumac...@gmx.net> > wrote: > > Hi, > > recently there were several merge commits (especially for merged pull > request). > > I thought the consensus was to avoid merge commits to keep the git > history as clean as possible. > > Should we keep this policy? > > What do you think? > > Cheers, > > Pascal > >
