You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@airflow.apache.org by Kaxil Naik <ka...@gmail.com> on 2019/10/02 15:29:04 UTC

Merging PRs

Hello, all committers & PMC members,

Whenever your merge PRs, please make sure that the commit message follows
the following structure:

*[AIRFLOW-XXX] COMMIT_MSG (#PR_NUMBER)*

Example: *[AIRFLOW-5574] Fix Google Analytics script loading (#6218)*

This will make our Changelog easy to read too :)

PS: Wherever possible try to use *Squash* *and* *Merge *instead of *Rebase
and* *Merge *when merging PRs.

Regards,
Kaxil

Re: Merging PRs

Posted by Sergio Kef <se...@gmail.com>.
In my github projects I like disabling Rebase & Merge and allow only Squash
& Merge. This is also an option.

On Thu, 3 Oct 2019 at 09:56, Елена Лавренюк <la...@mail.ru.invalid> wrote:

>
> FYI: I added instructions below to the Contribution guide.
>
>
> >Среда, 2 октября 2019, 18:29 +03:00 от Kaxil Naik <ka...@gmail.com>:
> >
> >Hello, all committers & PMC members,
> >
> >Whenever your merge PRs, please make sure that the commit message follows
> >the following structure:
> >
> >*[AIRFLOW-XXX] COMMIT_MSG (#PR_NUMBER)*
> >
> >Example: *[AIRFLOW-5574] Fix Google Analytics script loading (#6218)*
> >
> >This will make our Changelog easy to read too :)
> >
> >PS: Wherever possible try to use *Squash* *and* *Merge *instead of *Rebase
> >and* *Merge *when merging PRs.
> >
> >Regards,
> >Kaxil
> >
>
>
> --
> Elena Fedotova
>

Re: Merging PRs

Posted by Елена Лавренюк <la...@mail.ru.INVALID>.
FYI: I added instructions below to the Contribution guide.

  
>Среда, 2 октября 2019, 18:29 +03:00 от Kaxil Naik <ka...@gmail.com>:
> 
>Hello, all committers & PMC members,
>
>Whenever your merge PRs, please make sure that the commit message follows
>the following structure:
>
>*[AIRFLOW-XXX] COMMIT_MSG (#PR_NUMBER)*
>
>Example: *[AIRFLOW-5574] Fix Google Analytics script loading (#6218)*
>
>This will make our Changelog easy to read too :)
>
>PS: Wherever possible try to use *Squash* *and* *Merge *instead of *Rebase
>and* *Merge *when merging PRs.
>
>Regards,
>Kaxil
>  
 
 
--
Elena Fedotova