On Mon, Sep 25, 2017 at 10:29 AM Daniel Gruno <[email protected]> wrote:
> However, do note that if you merge from > a fork via a PR, GitHub does some weird magic where it silently inserts > the changes into our repo and then merges it. This messes up the diffs > > Out of interest, I noticed a little while ago that GitHub had changed the pull request UI to allow squash & merge and rebase & merge options as well as the default. Would either of these do better on the "weird magic" issue? Best wishes, Neil -- Neil C Smith Artist & Technologist www.neilcsmith.net Praxis LIVE - hybrid visual IDE for creative coding - www.praxislive.org
