mxnet-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Carin Meier <carinme...@gmail.com>
Subject Re: Which merge option to use on the Import Julia binding PR?
Date Wed, 26 Sep 2018 23:38:31 GMT
Kellen,

Thanks for your input. We can certainly try squash and merge and see if
there are any issues.

My inclination is same as yours in the case of the git rework, but I'm not
sure how feasible it is since commits go back to Jan 2017 - It's bringing
in this repo work I believe https://github.com/dmlc/MXNet.jl.

Here is an example of the first commit in the PR
Commits on Jan 29, 2017

   1.

   Merge pull request
   <https://github.com/apache/incubator-mxnet/pull/10149/commits/79d80b6e3f2e66cf42a5e59d0f383ade8e1b4e95>
    #196 <https://github.com/apache/incubator-mxnet/pull/196> from
   dmlc/vc/fix_win
   <https://github.com/apache/incubator-mxnet/pull/10149/commits/79d80b6e3f2e66cf42a5e59d0f383ade8e1b4e95>
    …
   [image: @vchuravy] <https://github.com/vchuravy>
   vchuravy
   <https://github.com/apache/incubator-mxnet/commits?author=vchuravy>
    committed on Jan 29, 2017

   remove usr/setupenv.cmd because it is too invasive



On Wed, Sep 26, 2018 at 7:15 PM kellen sunderland <
kellen.sunderland@gmail.com> wrote:

> My gut feel would be just to squash and merge, it usually works quite well.
>
> Is there any chance that someone might want to cherry-pick, revert or
> rebase any portions of the PR?
>
> If so what I try and is to provide atomic commits the bring small
> individual pieces of value to the codebase.  This often means at the end of
> the PR I'd do some git hygiene, get rework my commits and then force push.
> I try to ensure that I also leave a backup branch in GitHub that contains
> my original git history.  If you have an atomic chain of commits then it
> might make more sense to rebase and merge.
>
> On Wed, Sep 26, 2018, 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