[almighty] github merge option for almighty-core

[Karanbir Singh]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Rebase to master, from the PR  would - but then a merge back to master
would still squash all the commits into 1 change at point of merge
back into master. Thats how the git repo is setup at the moment, and
seems wrong to me.

If a feature is worked on for a few days, across the team, and then
pushed into a single PR to merge into master, we are destroying the
entire history of that code.

regards,

On 21/09/16 19:18, Max Andersen wrote:
> Rebase keeps history does it not ?
> 
> Sent from my iPhone
> 
> On 21 Sep 2016, at 18:28, Karanbir Singh <kbsingh at redhat.com 
> <mailto:kbsingh at redhat.com>> wrote:
> 
> hi,
> 
> I just noticed that the only merge option for almighty-core is now 
> squash-and-merge, ie. we cant retain commit history for the PR's.
> Is this by design ?
> 

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

iQEcBAEBAgAGBQJX47H4AAoJEI3Oi2Mx7xbtF6oIAKxV1r7aPkBDySUQVqj+5khd
3i+psJ5SCXqLJFEC827K+VMEV37pveWtNghRv5MgUKSCGYGX9KPkIiasLkW4RNdK
IHtoyp5UvxcvuDGh63doSf0m6vGNitBlvtJ9oG9t3DIS+bFrAugJ9LKl69cRyQuC
wlPv0Kq+goEkZK/CuvPhpM7PWkdLgpKQiJXPreVDohWeZfF6aECA87Mf9elQuDta
Qt77+Z3Jj3mjLD1lSDXqrAD58n6HbZQwkKm12UUkJpULQA/AO64A1sN1XdYTVxx5
Ka15IQdpY4fbQX2rO/qNvcpkQkiIvX7cRSxOLpYmGHxTREPWM8O2kPTcrEmnPsE=
=/x5C
-----END PGP SIGNATURE-----