[core-workflow] GitHub Workflow

[Tres Seaver]

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

On 03/17/2016 05:48 AM, Oleg Broytman wrote:

> -- Interactively rebase master onto the feature branch

The directionality seems wrong here:  one would be rebasing the feature
branch onto the head of `master`:  "rebase master" would mean "rewrite
master's history", which cannot be correct.

> -- Move back to the master branch and cherry-pick in the newly
> squashed feature commit

I don't understand the cherry-pick:  why not just merge the rebased
feature branch with 'git merge --squash', and fix up the changelog in the
commit message of the merge commit?


Tres.
- -- 
===================================================================
Tres Seaver          +1 540-429-0999          tseaver at palladion.com
Palladion Software   "Excellence by Design"    http://palladion.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJW6rubAAoJEPKpaDSJE9HYeScP/3oG/duoBb4RFJz4vxuN1+Or
a/sqc2GK3mGWs2G4HpcCIJl2jdOqsT3zvB7//Mp2DbcCwaBnQB4wg8BqBZN7z+lO
Qw7zNOerJpMjaQarVIMCtGi/vPkpN8ZPbM9y5qwhjDfywxD62aV/+H7yAg2rw+PY
5HfstwDDTiDdHiaa7MUrKTuVO6X5h1p0ZITpaCLZuGYf9tL17Ly3vaoZOe7SNz2/
k9w6TT6hNiD0YYdiNYv5ettD9o4UjQbQThHUmV0dQ1umcn6+GAEEX3w8xh5ewMcH
MVC/Ptx32zDRqN411fguudJv2IzOB1m1nJnpQjG9KQ0ZSqNdYAgCj9fb9eRWue2M
TuDDHOX/RLlOXGBi/vtbzF1bldnUDRF3mlEmFosNvLbDGdhrGE+NKEqCTq9kylE6
QsqPeCbVaxjU3gc705hKGFm0Owqg0Kacc8HXIZXYY/aRNpGPEFYq+e1wlUOThFiE
f7rcFJOPBDhz9gsbhcUNwV/97MZ0dO9kqwKfcV9NVYNssk1aj/XZEnajMACdBQ4t
WJdCuiAeGefVSEKmxegM6GK7jI12auf95zG9NeqHPkyGhcnSknp7z9V2yAzmcjFt
ZohcrJKtLffPS8Fc2rFK8jaQjWCtmOMLBwPardq3eCtpHv35MS/W0FNRuL2f5MJX
LAJSqpbiJfEsv/uFSDDm
=952r
-----END PGP SIGNATURE-----