Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From: MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr>
Newsgroups: linux.debian.maint.python
Subject: RE:Packaging python-xrayutilities
Date: Mon, 18 Mar 2019 16:50:01 +0100
Message-ID: <xD2Gt-3gl-1@gated-at.bofh.it>
References: <xCWUp-8b8-15@gated-at.bofh.it> <xCXns-9M-21@gated-at.bofh.it> <xD2Gt-3gl-3@gated-at.bofh.it> <xD2n7-39O-7@gated-at.bofh.it>
Old-Return-Path: <alexandre.marie@synchrotron-soleil.fr>
Thread-Topic: Packaging python-xrayutilities
Thread-Index: AdTdbg8sMxhRl7roRP2zSfL6uDxPxv//8OeAgABthEf///GTAIAAFI0H
Accept-Language: fr-FR, en-US
Content-Language: fr-FR
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Approved: robomod@news.nic.it
Lines: 18
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
Xref: csiph.com linux.debian.maint.python:11384

>  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 ar=
e
>  modified in the master branch in the current state.

When I do so, I only have one conflict on the file .gitignore.
I solved it and tried to commit all the staged changes in git gui, I get th=
is message :

```commit-tree failed: fatal: 5d93...... is not a valid 'commit object'```

This error prevents me from doing anything more.

Thanks in advance for response.

Cheers,

Alex=