Merge forks/branches

Question

Merge forks/branches

mrocklin opened this issue 7 years ago · comments

People have submitted PRs to three forks/branches recently:

dask/master
moody-marlin/master
moody-marlin/no_api

It would be good to merge these all to some fork/branch quickly so that we don't need to go through expensive merging later on. I don't particulaly care which fork/branch, but I would prefer to see things drive towards a common point. It becomes expensive to merge if things diverge for too long.

cc @moody-marlin @hussainsultan

Hussain Sultan · Answer 1 · Tue Jan 24 2017 03:58:34 GMT+0800 (China Standard Time)

Thanks for the callout. I am working with @moody-marlin to consolidate all the previous work and make a PR to dask-glm repo. Going forward, dask/dask-glm should be the only repo that we work with instead of working with forks directly. Thoughts?

Matthew Rocklin · Answer 2 · Tue Jan 24 2017 04:09:40 GMT+0800 (China Standard Time)

I'm personally fine with anything, as long as code doesn't linger too long in other forks/branches. I personally tend to develop within my own fork and then merge within a few days.

…

On Mon, Jan 23, 2017 at 2:58 PM, Hussain Sultan ***@***.***> wrote: Thanks for the callout. I am working with @moody-marlin <https://github.com/moody-marlin> to consolidate all the previous work and make a PR to dask-glm repo. Going forward, dask/dask-glm should be the only repo that we work with instead of working with forks directly. Thoughts? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#4 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AASszBy-Fld-pEUs1qBDPh28Uz01go2Vks5rVQZqgaJpZM4LrETn> .