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. -- WBR, wRAR
Attachment:
signature.asc
Description: PGP signature