Path: csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod From: Andrey Rahmatullin Newsgroups: linux.debian.maint.python Subject: Re: Packaging python-xrayutilities Date: Mon, 18 Mar 2019 16:30:01 +0100 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Mon Mar 18 15:22:59 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-12 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LDO_WHITELIST=-5, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -3.5 Dkim-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=wrar.name; s=20160710; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oouZWwG5IvITeSLIsxUHAatDRF6BVUuKeFA1V/htqZE=; b=p2pptP/FEb9olcEfkv3T7wlznO lJ7xOlBxtcCbKmKCAwiPGHR4N6jsEVoxEzpdFIvrgZVtIi3DNTblOHas/3GDUP2lIxoNBA9mSLH6b YwToVXeO84DVt61ZjdvY6K7jCkDpWycYtZHhy39j70evklnRH432m1sdnLULcg5mtXwg=; MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LpQ9ahxlCli8rRTG" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailing-List: archive/latest/16844 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20190318152246.GB1440@belkar.wrar.name Approved: robomod@news.nic.it Lines: 37 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Mon, 18 Mar 2019 20:22:46 +0500 X-Original-Message-ID: <20190318152246.GB1440@belkar.wrar.name> X-Original-References: <7EF15309FAA2EA4FAB1643CB55D93ED8DBC338@SUN-DAG3.synchrotron-soleil.fr> <7EF15309FAA2EA4FAB1643CB55D93ED8DBC548@SUN-DAG3.synchrotron-soleil.fr> Xref: csiph.com linux.debian.maint.python:11383 --LpQ9ahxlCli8rRTG Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 18, 2019 at 03:20:24PM +0000, MARIE Alexandre wrote: > gbp:error: Automatic merge failed. You need to find why there are conflicts and fix them. Good first steps are running gbp with --no-rollback and/or finding what upstream files are modified in the master branch in the current state. --=20 WBR, wRAR --LpQ9ahxlCli8rRTG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAlyPt8ItFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh DBAP/3PywwlHBI0+cGaFhGcC3ia066fumajf7RW+XycajB+vzckIB1w1LO5QUkYY DtLea2KvJ0scucZuwFJBGa3bxTEanwUYMI2VRLzAufPi+2HdCcqL6lrQ/sAwCVe4 RjBh8IzhhdIs86YIlE3JV71phMPfawKqCCgsBrbEUdmA2vXADx2HbEA/1jkn1cX7 NEZ2jgrkfnlxubZkmkoEEVAPE/Tu+9MlRJ3KJiG0sFHDIQf4RjP3IZ5buUsENJDV DKCyphkQVnk0yQQLT3l3PcYfYMoAeZjTzJFcN95MLNihCaroGJGm1H77ydfKNdDO HWetavxE6H/b+UyngCoMbTReYBjTC6HxJHxuByJCFEJBHPIfjGghYfwAlpJgP6mX mIiMqq8NYnFr/pWBFt9oLE5mZHXq6lroYTCDBHQou95VstCeYFe5kvdTZKQ2duQc ZbxIHVt7VRBKwJkqDrQlXOBsExASVRqOinjr3PdZvj3GZsqNk8VXqH6LDg9kcLFL 2ljGelyjgI9wDrmauHuJmex5WB3NFwvnokGhYG1KQbvtVL0zuI02ct8606pUzZtT C4HEJ5Z03ytxdjM0lMEJC4z81uEWeUFFumzTi4C6Zj9FkEzU+yox52aCh6FgVmCT 13IwNna3+qZ7+aztJcBvhAOPby5Nfb4Q2sel7Y24FGyxLkDb =e35M -----END PGP SIGNATURE----- --LpQ9ahxlCli8rRTG--