airflow-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Driesprong, Fokko" <fo...@driesprong.frl>
Subject Re: We've migrated to Github to repo!
Date Tue, 31 Jul 2018 19:37:08 GMT
Hi Max,

You're right. I just started plowing though my mailbox and merged a commit
without squash and merge, but it changes history as you mention.
Nice thing of Github is if you change it, it remembers your preference
which is Squash and Merge :-)

Love the Gitbox so far, great work!

Cheers, Fokko

2018-07-31 21:34 GMT+02:00 Maxime Beauchemin <maximebeauchemin@gmail.com>:

> "Squash & Merge" (the default) does the right thing (squashes the multiple
> commit and replays the resulting commit on top of master), we should use
> that most of the times. We'd only want to merge if we wanted to preserve
> history from within the PR (multiple collaborators or multiple important
> commits that we want to keep detailed in master for instance).
>
> I'm not sure how to verify whether the `master` branch is protected on this
> setup (without pushing to it as a test, which I'd rather not do). We should
> make sure that it is though as changing history on master can cause all
> sorts of problems.
>
> Max
>
> On Tue, Jul 31, 2018 at 9:21 AM Sid Anand <sanand@apache.org> wrote:
>
> > The other benefit of using Option 3 over Option 1 is that you maintain
> the
> > history of who committed and who authored in one line in the Git log--
> i.e.
> > "bob33 authored and ashb committed 3 hours ago" instead of just "ashb
> > committed" for a merge commit followed by the commit(s) from bob33.
> >
> > On Tue, Jul 31, 2018 at 9:11 AM Sid Anand <sanand@apache.org> wrote:
> >
> > > Ash,
> > > This is pretty cool. I just merged one PR from GH directly.
> > >
> > > Interestingly, I still used the `dev/airflow-pr work_local` to test out
> > > the PR, but merging directly in the GitHub UI afterwards definitely
> > avoided
> > > my needing to do another `dev/airflow-pr merge` CLI command.
> > >
> > > There are 3 options in the UI: The default is "Create a merge commit"
> > > (Option 1). I think the ones we want is the "Rebase & Merge" (Option
> 3),
> > > which requires that PR submitters squash their commits. Otherwise, we
> > could
> > > use "Squash & Merge" (Option 2), though I am not clear if Squash &
> Merge
> > is
> > > more like option 1 or option 3.
> > >
> > > -s
> > >
> > > On Mon, Jul 30, 2018 at 7:19 PM Andrew Phillips <aphillips@qrmedia.com
> >
> > > wrote:
> > >
> > >> > We should ask Apache infra to send the GH notifs to another mailing
> > >> > list.
> > >>
> > >> Over at jclouds, we created a "notifications@" list for this purpose
> > >> (well, actually we renamed "issues@" to "notifications@"), and send
> > >> messages there:
> > >>
> > >> https://issues.apache.org/jira/browse/INFRA-7180
> > >> https://mail-archives.apache.org/mod_mbox/jclouds-notifications/
> > >>
> > >> Regards
> > >>
> > >> ap
> > >>
> > >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message