Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 712B8200D1D for ; Sat, 14 Oct 2017 17:01:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 66BAB160BE6; Sat, 14 Oct 2017 15:01:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B3DB91609D5 for ; Sat, 14 Oct 2017 17:01:14 +0200 (CEST) Received: (qmail 8113 invoked by uid 500); 14 Oct 2017 15:01:13 -0000 Mailing-List: contact dev-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list dev@camel.apache.org Received: (qmail 8102 invoked by uid 99); 14 Oct 2017 15:01:13 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Oct 2017 15:01:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id AABA11A2149 for ; Sat, 14 Oct 2017 15:01:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.28 X-Spam-Level: ** X-Spam-Status: No, score=2.28 tagged_above=-999 required=6.31 tests=[HTML_MESSAGE=2, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id YvR0gzGhxpqK for ; Sat, 14 Oct 2017 15:01:11 +0000 (UTC) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id E613860E09 for ; Sat, 14 Oct 2017 15:01:10 +0000 (UTC) X-Originating-IP: 80.215.40.130 Received: from [100.119.110.228] (unknown [80.215.40.130]) (Authenticated sender: jb@nanthrax.net) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 12AE317209A for ; Sat, 14 Oct 2017 17:01:03 +0200 (CEST) In-Reply-To: References: X-Referenced-Uid: 1445520 Thread-Topic: Re: [IMPORTANT] - When you merge github PRs User-Agent: Android MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----8SUYXAFNUAB3WUQ1REPMO1SDBSBM64" Content-Transfer-Encoding: 7bit Subject: Re: [IMPORTANT] - When you merge github PRs From: =?ISO-8859-1?Q?Jean-Baptiste_Onofr=E9?= Date: Sat, 14 Oct 2017 17:00:45 +0200 To: dev Message-ID: archived-at: Sat, 14 Oct 2017 15:01:15 -0000 ------8SUYXAFNUAB3WUQ1REPMO1SDBSBM64 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Hi In Karaf I configured a Jenkins build to be triggered on each PR=2E The= results are in the PR comments and so you can merge only if the build is g= reen on Jenkins=2E Maybe we can setup the same in camel ? Regards JB On = Oct 14, 2017, 14:48, at 14:48, Grzegorz Grzybek = wrote: >Hello > >+1 > >Also, when you backport (e=2Eg=2E, from master to 2= =2E19=2Ex) changes by >cherry-pick, use: > >git cherry-pick -x > >which giv= es automatic reference to picked commit (SHA1) in the new >commit >message= =2E > >regards >Grzegorz Grzybek > >2017-10-14 14:28 GMT+02:00 Claus Ibsen = : > >> Hi >> >> When you merge github PRs then i= ts important to merge and rebuild on >> top afterwards so we have a straigh= t git tree=2E >> >> So after you have done the merge, then you SHOULD run >= > >> git pull --rebase >> >> Then it replay the merge on top of latest= master=2E And if there is any >> conflicts you need to fix them, so we can= merge any PR cleanly on >> latest master=2E >> >> Otherwise we end up with= a more complex git tree that makes it harder >> to maintain and also backp= ort bug fixes to older branches=2E >> >> Also refrain from backporting triv= il javadoc changes and others to >> older branches=2E The older branches ar= e intended to be "quiet" and for >> bug fixes and minor needed improvements= only=2E The less changes we >have >> one these the better for the end user= s as they are are for patch >> releases for production users=2E >> >> >> >>= -- >> Claus Ibsen >> ----------------- >> http://davsclaus=2Ecom @davsclau= s >> Camel in Action 2: https://www=2Emanning=2Ecom/ibsen2 >> ------8SUYXAFNUAB3WUQ1REPMO1SDBSBM64--