Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2A98911B7B for ; Thu, 31 Jul 2014 04:08:17 +0000 (UTC) Received: (qmail 81948 invoked by uid 500); 31 Jul 2014 04:08:16 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 81902 invoked by uid 500); 31 Jul 2014 04:08:16 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 81875 invoked by uid 99); 31 Jul 2014 04:08:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2014 04:08:15 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=HTML_MESSAGE,MISSING_MID,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of Rajani.Karuturi@citrix.com designates 103.14.252.240 as permitted sender) Received: from [103.14.252.240] (HELO SMTP.CITRIX.COM.AU) (103.14.252.240) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2014 04:08:10 +0000 X-IronPort-AV: E=Sophos;i="5.01,769,1400025600"; d="scan'208,217";a="8528783" From: Rajani Karuturi To: "dev@cloudstack.apache.org" Subject: Re: [DISCUSS] git commit proces Thread-Topic: [DISCUSS] git commit proces Thread-Index: AQHPqldLicM9LwrGtE6ecQSWWG4pwZu03XyAgAAArICAAAU+gIAAG1cAgAAKEwCAAAfAAIAAG/6AgABE1ACAAHMFAIAARMwAgAEBuQCAAJi3gIAA9DMAgABXUgA= Date: Thu, 31 Jul 2014 04:07:47 +0000 References: <85B56B1AEDD2674A82DEC8B61E1218293DEE0A@AMSPEX01CL01.citrite.net> <56635351-33F5-4322-8A89-599891689812@schubergphilis.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: multipart/alternative; boundary="_000_10312968AB9649BF96C63926DE87678Ccitrixcom_" MIME-Version: 1.0 X-DLP: SIN1 X-Virus-Checked: Checked by ClamAV on apache.org Message-Id: <20140731040815.BC7F1FDC@athena.apache.org> --_000_10312968AB9649BF96C63926DE87678Ccitrixcom_ Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable 4. Then, conflict would happen when you merge release/4.4. branch to release/4.5. Since the version number changed to 4.4.1. You need to deal with version number conflict every time when merge to upper release. one empty merge with git merge -s ours after the version change and git wou= ld not complain again. git would assume that conflicts are resolved and tha= t particular commit need not be merged again. git merges are relative it won=92t merge the entire tree each and every tim= e. ~ Rajani --_000_10312968AB9649BF96C63926DE87678Ccitrixcom_--