mxnet-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chiyuan Zhang <plus...@gmail.com>
Subject Re: Which merge option to use on the Import Julia binding PR?
Date Thu, 27 Sep 2018 00:11:54 GMT
Hi Carin,

Can you clarify the pros and cons of the two approaches? Is the main
concern here about logistics (e.g. preserving the history of the original
repo and developments) or technical issue (e.g. using squash might end up
with a huuuuge commit message that might be difficult or hard to handle)?

I think it might not be very likely that someone is going to cherry pick
revert some of the commits. But preserving the commit history is still
useful in case one need to trace the change or bisect for some regression
bugs, etc.

Just to provide some context: the PR actually contains 700+ commits, and it
dates back to 2015. The development of the Julia binding started in the
early stage of MXNet. We started with a separate repo due to the
requirement of the package system of julia.

Best,
Chiyuan

On Wed, Sep 26, 2018 at 3:41 PM Carin Meier <carinmeier@gmail.com> wrote:

> The Import Julia binding PR ,(
> https://github.com/apache/incubator-mxnet/pull/10149), is getting very
> close to being merged. Because of the large number of commits there was a
> suggestion not to use the usual "Squash and Merge".  The only option would
> be "Rebase and Merge" since merging with a merge commit is not enabled for
> the project.
>
> *Squash and Merge* - The commits from this branch will be combined into one
> commit in the base branch (With all the commit messages combined)
>
> *Rebase and Merge* - The commits from this branch will be rebased and added
> to the base branch
>
> The PR is over 250+ commits (Github won't show all of them)
>
> Thoughts about how we should handle the merge?
>
> Thanks,
> Carin
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message