From dev-return-4216-archive-asf-public=cust-asf.ponee.io@mxnet.incubator.apache.org Thu Sep 27 01:38:48 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C72FD180629 for ; Thu, 27 Sep 2018 01:38:47 +0200 (CEST) Received: (qmail 79645 invoked by uid 500); 26 Sep 2018 23:38:46 -0000 Mailing-List: contact dev-help@mxnet.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mxnet.incubator.apache.org Delivered-To: mailing list dev@mxnet.incubator.apache.org Received: (qmail 79633 invoked by uid 99); 26 Sep 2018 23:38:46 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2018 23:38:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B47261806F2 for ; Wed, 26 Sep 2018 23:38:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.898 X-Spam-Level: * X-Spam-Status: No, score=1.898 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_DKIMWL_WL_MED=-0.01, T_REMOTE_IMAGE=0.01] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id mO-LfMyXsxVI for ; Wed, 26 Sep 2018 23:38:44 +0000 (UTC) Received: from mail-it1-f179.google.com (mail-it1-f179.google.com [209.85.166.179]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 1B94E5F1D3 for ; Wed, 26 Sep 2018 23:38:44 +0000 (UTC) Received: by mail-it1-f179.google.com with SMTP id 139-v6so5339000itf.0 for ; Wed, 26 Sep 2018 16:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=ocrKf6hGz/9xegEi69E1axQNBMy+mLVmgRDjUy6Di7s=; b=DQNibRJ7U30XUTP7J+o4BSq3Wh6Gr1qhqIjxPrum7ln0aGmNKK+V0p2YpPTvnBEQQu QKcN11f/3sJ+Y1EB+/HyOsMSV5ZV6bXfm2HIu9qI5dOTq8OZYN8GPmfmEyLMdBgIVLwS PG7tQ+dw64NNfd7l+/6MtFd2f5NTnCSdVjzoRWYioYAkRXz7RKVGm6VUh2B9+THMB4qP 1OHkFnVYwpKFdltLRQPr/PMInhOTSERTk4HMyZ0sJtOwDq2aWGn55d5qtHjY597/xW8K YT9CvuaMprKEl37DidUJxWE2ez/7J9Exw7oGHTwvwex+8DDJ8uiWR0hyRpQhryEQKur+ SPIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=ocrKf6hGz/9xegEi69E1axQNBMy+mLVmgRDjUy6Di7s=; b=HIgdRCtztXVcCKvp8B5CiuWZudhqb5VgsMlNy/uuYQbzdqTkw4UXlIkoUzvrH9X2YC woUSCa87SYewni0lOBIo4l5yoy3L3vY28UpwcRUhWCvgbOssQnKUQlxGdI77RkOa0nmO hcRTmDUS5Ufo6ae+zOn/JxXIVvd4KSuxmT2E3EVzTgY826dpbWCm74CDzkRsT7MgDd4f +CflFVR1yf6+pfKmvWEKM38/jjwmjHItjawp5MjfKflIRn1Fa3ox1eHrmXN6HX9sN1qY enszzXTNihf2PhpuIHYwFhCd43iXe3gweqsSf75qCj23tCjeuJ1sQV/KJvG1RrMpyKQe cd9w== X-Gm-Message-State: ABuFfoi17JDiN696wSRqt0OzcXkfu8Ukc0EiEqjg4TABt6Y9NWtlDyNp TSjg3x3DRsPXcsenn5rQm7QFL8qTITnBanlgLqUUOJr2 X-Google-Smtp-Source: ACcGV626TZPa8ZpVASNn6u338Us1wL2KpLJ5O94xEugApIRYIjFm9jxH+rpShEKBzpjfT3KDJHg8jdPyjQTqXkLGK4w= X-Received: by 2002:a24:f605:: with SMTP id u5-v6mr7450467ith.17.1538005122967; Wed, 26 Sep 2018 16:38:42 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Carin Meier Date: Wed, 26 Sep 2018 19:38:31 -0400 Message-ID: Subject: Re: Which merge option to use on the Import Julia binding PR? To: dev@mxnet.incubator.apache.org Content-Type: multipart/alternative; boundary="0000000000000470590576ceb96e" --0000000000000470590576ceb96e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 #196 from dmlc/vc/fix_win =E2=80=A6 [image: @vchuravy] 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 wel= l. > > 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 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 > > > --0000000000000470590576ceb96e--