[almighty] github merge option for almighty-core

[Pavol Pitonak]

AFAIK if you allow merge commits in Github repo, the merge button will
always create a merge commit, even if you rebase and squash your commits in
PR.

If you want to keep history reasonable linear and also keep important part
of history in PR, you cannot use merge button in Github UI but you need to
merge PRs manually from CLI.

Regards,
Pavol

On Thu, Sep 22, 2016 at 2:50 PM, Karanbir Singh <kbsingh at redhat.com> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 22/09/16 13:14, Andrew Lee Rubinger wrote:
> > So I don't believe in a particular policy or one-size-fits-all
> > approach; generally I like to rebase and squash so that a commit or
> > several fit neatly atop master, then test and merge.
>
> +1 for giving the contributors the flexibility to do this working at
> the PR level.
>
> - -1 for enforcing it at the central git repo, by way of policy.
>
>
> - --
> Karanbir Singh, Project Lead, The CentOS Project, London, UK
> Red Hat Ext. 8274455 | DID: 0044 207 009 4455
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.22 (GNU/Linux)
>
> iQEcBAEBAgAGBQJX49OzAAoJEI3Oi2Mx7xbtap8H/2xk++swKr8f/K9V0zaKatYa
> rekkdKC2joE9D/XGlOQBtVvEaIO1heeBOB/JS6YCVh3NEfq79peDKL9MgPejQyLj
> UebjWUHv8789LeMHxp4jW/KJIJN9owQJXaGwHVUG2A4TGctusBxfuvs+j+fL3Ify
> Jz2bXD6tQXlVjZ50fmQmDpjp0MKnmXlHmdzc6P/45W29XvMcs+ZH+sAj8Fb0XbJ+
> h/9liW/f1uoqp9dNoQBHEQKe/iPUtZOeubK+XZknq/Ot1vvfl2b6ai8wy41uUGtZ
> oEeodz++a+s3c4PlbIryOO20JpI7ZNLB1I8XfRdwS5SoW6LKv1FHV35KHRlxu4I=
> =k+2S
> -----END PGP SIGNATURE-----
>
> _______________________________________________
> almighty-public mailing list
> almighty-public at redhat.com
> https://www.redhat.com/mailman/listinfo/almighty-public
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/almighty-public/attachments/20160922/d4918dfb/attachment.htm>