Hi Yes we should do rebase and merge, or squash and merge style, so its linear. On github the green button is default for "squash and merge".
I always do git pull --rebase from CLI before pushing, so my commits are added on top of the branch. On Wed, Apr 15, 2020 at 10: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 > > -- Claus Ibsen ----------------- http://davsclaus.com @davsclaus Camel in Action 2: https://www.manning.com/ibsen2
