Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #11384

RE:Packaging python-xrayutilities

From MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr>
Newsgroups linux.debian.maint.python
Subject RE:Packaging python-xrayutilities
Date 2019-03-18 16:50 +0100
Message-ID <xD2Gt-3gl-1@gated-at.bofh.it> (permalink)
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>
Organization linux.* mail to news gateway

Show all headers | View raw

>  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.

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 this 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

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 10:40 +0100
  Re: Packaging python-xrayutilities Florian Pelgrim <fp@craneworks.de> - 2019-03-18 11:10 +0100
    RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 16:30 +0100
      Re: Packaging python-xrayutilities Andrey Rahmatullin <wrar@debian.org> - 2019-03-18 16:30 +0100
        RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-18 16:50 +0100
          RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-19 14:10 +0100
            RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 11:10 +0100
              Re: Packaging python-xrayutilities Andrey Rahmatullin <wrar@debian.org> - 2019-03-21 11:30 +0100
                Re: Packaging python-xrayutilities Andreas Tille <andreas@an3as.eu> - 2019-03-21 11:50 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 12:00 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 11:50 +0100
                Re: Packaging python-xrayutilities Alex Mestiashvili <amestia@rsh2.donotuse.de> - 2019-03-21 12:10 +0100
                RE:Packaging python-xrayutilities MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-03-21 12:20 +0100
              Re: Packaging python-xrayutilities Dmitry Shachnev <mitya57@debian.org> - 2019-03-21 12:40 +0100
                Re: Packaging python-xrayutilities Dmitry Shachnev <mitya57@debian.org> - 2019-03-21 12:50 +0100

csiph-web