> 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 com
On Mon, Mar 18, 2019 at 03:20:24PM +, 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.
Thanks again for the response !
I am resending an answer as the first one was sent to Florian Pelgrim only.
> Try to replace all http links to https in your package.
Changing http to https didn't solve the issue.
I still get this error :
Hi there,
I'm not really deep into packaging but it sounds like the build process
is looking for https links on the uscan target.
Try to replace all http links to https in your package.
Cheers
Flo
Am 18.03.19 um 10:36 schrieb MARIE Alexandre:
Hello,
I'm sorry if this is in the wrong place.
Hello,
I'm sorry if this is in the wrong place.
I've already asked for help but I had not explained well how I was encountering
my problem and couldn't answer before today.
So here it is, i'm trying to update the debian package of python-xrayutilities.
The problem is when I run:```gbp import
5 matches
Mail list logo
