From dev-return-46190-apmail-ignite-dev-archive=ignite.apache.org@ignite.apache.org Thu Jun 6 16:42:31 2019 Return-Path: X-Original-To: apmail-ignite-dev-archive@minotaur.apache.org Delivered-To: apmail-ignite-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 3F5A51905D for ; Thu, 6 Jun 2019 16:42:31 +0000 (UTC) Received: (qmail 1843 invoked by uid 500); 6 Jun 2019 16:42:30 -0000 Delivered-To: apmail-ignite-dev-archive@ignite.apache.org Received: (qmail 1826 invoked by uid 500); 6 Jun 2019 16:42:30 -0000 Mailing-List: contact dev-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list dev@ignite.apache.org Received: (qmail 1814 invoked by uid 99); 6 Jun 2019 16:42:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2019 16:42:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 723B1C6E82 for ; Thu, 6 Jun 2019 16:42:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.155 X-Spam-Level: X-Spam-Status: No, score=0.155 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FROM_EXCESS_BASE64=0.105, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id YglltiswxHrv for ; Thu, 6 Jun 2019 16:42:27 +0000 (UTC) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 7DC145F175 for ; Thu, 6 Jun 2019 16:42:27 +0000 (UTC) Received: by mail-ot1-f53.google.com with SMTP id p4so2614413oti.0 for ; Thu, 06 Jun 2019 09:42:27 -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 :content-transfer-encoding; bh=YdiAaphUAahtdSfYxVUmGdISl09WgRJhohKRtFuhiog=; b=EbXsDOPT0tg9OywMcqZgmrkuU6o8d3U2NJQC3mYMU9ccvMcheTVvABYk8EywJGX+zm 35ReEvB2AeFQ1md1KR2WCcxSNSQaTTsDcD/RCA5slmVAbpDqLdSBugqgs2ZkD00nBytb pVNsZlaZw535u7dakqgVxgkVHPeBEEcTBaYrW0FnlAsPPZ8Hiv6cVUsfUun+BFsCed/h 0nF6ur9rXwADhzU1l75dDoOANussmL+cPwFmMUFYc3xSWeZpwj+8fSdt5uHbgpLjQ+El sBuV8lFuO+pPLv1cQd3l4XVFGQC5rzm45UO7I+e921HsUVupxo6nSoooGtX1t1Eqwxqk otCQ== 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:content-transfer-encoding; bh=YdiAaphUAahtdSfYxVUmGdISl09WgRJhohKRtFuhiog=; b=XKJ46AzyLEywCG9MzyvdYTCIPm53d+n4OybGpJY2DeqL/rDo5eXTcVZOk4J35OdWg4 HKj6jQZ400qAORzm1LJVBn53A3g6xCIjBW12mBGCvByEk5j8oM5iaj/mPuDLwqm5dnFX kQmpJf6UmrWq9FwTCpjGru/TO9dDaIbrCr084bpIXWIrMu7NGAgoVqKGieMudcWyRJvp BrN5ZlLKfaTf/5b0NlFoPeQXyYZeTuxnuI5Y+ljzm+PUOtLwwJp1SgXMr848tiDi0WVK HzDeGhGN05z1Fry5y/aN0Ae08LIBwFukxgDm3cKFkTy9/2AUAWeQ7HQ1w4RGFZxig5YB B7TQ== X-Gm-Message-State: APjAAAU5J36G06mxtD5BO/QGsf0xXC6A9QV5q9I18tIaiULqd/JEMCUh EwRqzSCaqV6k0m6sONG/Aa3uuhBWCgYT8tftDTNmsw== X-Google-Smtp-Source: APXvYqzq3uMtPJgkCkSkPSpivfykapfQ57qu/Za564i2R19fksz891DgPvEeip9fozbhm4vZ1OhrMki0qYk2lOoHcko= X-Received: by 2002:a9d:6d18:: with SMTP id o24mr15189473otp.313.1559839346649; Thu, 06 Jun 2019 09:42:26 -0700 (PDT) MIME-Version: 1.0 References: <7E0206C6-6E0E-4934-BB57-756DF7B2B801@gmail.com> In-Reply-To: From: =?UTF-8?B?0J/QsNCy0LvRg9GF0LjQvSDQmNCy0LDQvQ==?= Date: Thu, 6 Jun 2019 19:42:15 +0300 Message-ID: Subject: Re: Merge PRs via GitHub web UI To: dev Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Dmitriy, Yes, I agree that it is a totally great feature! But I would like to be sure that it does no harm. BTW, I use a copy of git repo on my machine to deal with merges without touching my working tree. =D1=87=D1=82, 6 =D0=B8=D1=8E=D0=BD. 2019 =D0=B3. =D0=B2 19:21, Dmitriy Pavl= ov : > > Hi Ivan, Igniters, > > Merge PRs via GitHub is the greatest change that Infra did recently. > > You can merge PRs without changing your local project state, and which is > why I believe is an absolutely positive thing for the community. Committe= rs > can do a review-merge while waiting for tests run, doing a big feature > locally: any activity they have locally does not affect review now. > > Sincerely, > Dmitriy Pavlov > > =D1=87=D1=82, 6 =D0=B8=D1=8E=D0=BD. 2019 =D0=B3. =D0=B2 19:03, =D0=9F=D0= =B0=D0=B2=D0=BB=D1=83=D1=85=D0=B8=D0=BD =D0=98=D0=B2=D0=B0=D0=BD : > > > It seems that the majority of recent commits were made manually. If I > > am not mistaken there should be a badge with a green text "Verified" > > near a commit if it was made via GitHub web UI. And currently I see > > only a few such commits. > > > > =D1=87=D1=82, 6 =D0=B8=D1=8E=D0=BD. 2019 =D0=B3. =D0=B2 18:48, Petr Iva= nov : > > > > > > If it was really GitHub problem =E2=80=94 it is still single incident= among many > > tens of merges every day. > > > Manual merge after review would more erroneous I guess. > > > > > > > > > > On 6 Jun 2019, at 18:43, =D0=9F=D0=B0=D0=B2=D0=BB=D1=83=D1=85=D0=B8= =D0=BD =D0=98=D0=B2=D0=B0=D0=BD wrote: > > > > > > > > Hi Igniters, > > > > > > > > I find merging PRs using GitHub web UI quite handy. AFAIK it is > > > > possible to merge AI PR in this way. But I heard some rumors that > > > > there were some problems with squashing such merges leading to comm= its > > > > with multiple parents in master > > > > > > > > From recent there is one commit [1] but I am not sure that GitHub > > > > merge caused it. > > > > > > > > So, my general question is as follows. Should we merge PRs via GitH= ub > > > > web UI or should we avoid it? > > > > > > > > [1] > > https://github.com/apache/ignite/commit/22652aa9883cfa3fd020658bcb230ce= a9ea6e4d4 > > > > > > > > -- > > > > Best regards, > > > > Ivan Pavlukhin > > > > > > > > > -- > > Best regards, > > Ivan Pavlukhin > > --=20 Best regards, Ivan Pavlukhin