Re: Merge Commits?

t;> > >>>> On Apr 15, 2020, at 10:00 PM, Claus Ibsen > >> wrote: > >>>> > >>>> Hi > >>>> > >>>> Yes we should do rebase and merge, or squash and merge style, so its > >> linear. > >>>> On github the

Re: Merge Commits?

gt; >>>> clearer if those are two separate commits. Also, my impression is > that the > >>>> project settings have the GitHub button be just “merge” without > squash. > >>>>> I’ve been waiting for review of my PRs which means it’s extremely > lik

Re: Merge Commits?

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 wrote: Hi, recently there were several merge commits (especially for merged pull request). I thought the consensus was to avo

Re: Merge Commits?

be a real help. >>>> >>>> Thanks >>>> David Jencks >>>> >>>>> On Apr 15, 2020, at 10:00 PM, Claus Ibsen >>> wrote: >>>>> >>>>> Hi >>>>> >>>>> Yes we should do

Re: Merge Commits?

ng will be a real help. > >>> > >>> Thanks > >>> David Jencks > >>> > >>>> On Apr 15, 2020, at 10:00 PM, Claus Ibsen > >> wrote: > >>>> > >>>> Hi > >>>> > >>>> Yes we should do rebase a

Re: Merge Commits?

PM, Claus Ibsen >> wrote: >>>> >>>> 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". >>>>

Re: Merge Commits?

t; wrote: >>>> >>>> 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

Re: Merge Commits?

> > >> 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 > >> wrote: > >>> > >>> Hi, &

Re: Merge Commits?

gt;> are added on top of the branch. >> >> >> >> On Wed, Apr 15, 2020 at 10:09 PM Pascal Schumacher >> wrote: >>> >>> Hi, >>> >>> recently there were several merge commits (especially for merged pull >>> request).

Re: Merge Commits?

, so my commits > are added on top of the branch. > > > > On Wed, Apr 15, 2020 at 10:09 PM Pascal Schumacher > wrote: >> >> Hi, >> >> recently there were several merge commits (especially for merged pull >> request). >> >> I th

Re: Merge Commits?

Schumacher 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

Re: Merge Commits?

+1 for avoiding merge commits in favour of linear history. While undocumented, I learned it on the job by reading the commit history which is mostly linear except developing big feature branches like the major upgrade. Of course, it would be better if the policy is documented clearly somewhere

Re: Merge Commits?

Thanks David Jencks > On Apr 15, 2020, at 2:08 PM, Andrea Cosentino wrote: > > I don't think there is a consensus around this.. we can collect here the > different views. Personally I don't think merge commits are evil, but if a > clean history is desired it's fine for me > >

Re: Merge Commits?

I don't think there is a consensus around this.. we can collect here the different views. Personally I don't think merge commits are evil, but if a clean history is desired it's fine for me Il mer 15 apr 2020, 22:09 Pascal Schumacher ha scritto: > Hi, > > recently there were seve

Re: Merge Commits?

; 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 > > > > > >

Re: Merge Commits?

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 > wrote: > > Hi, > > recently there were several merge commits (especially for merged pull > request). > &

Merge Commits?

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