Postgres Pro
Downloads
Home   >   mailing lists

Re: Multiple head revisions after git pull (2.0rc1 --> 2.0) - Mailing list pgadmin-support

From Willy-Bas Loos
Subject Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)
Date
Msg-id CAHnozTiKiOjTMUvQhnnMogskmwh7HUyLHNR17ds03S_CyVQNhA@mail.gmail.com
Whole thread Raw
In response to Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)  (Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>)
Responses Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)  (Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>)
List pgadmin-support
Tree view
On Fri, Nov 3, 2017 at 1:14 PM, Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com> wrote:
​Can you try following command see if that helps,
../web$ FLASK_APP=pgAdmin4.py flask db merge heads​

Given command will try to merge two conflicting heads together automatically.
For more information refer alembic documentation: http://alembic.zzzcomputing.com/en/latest/branches.html

-- Murtuza



That sounds and looks good and logical but it's not working
Whatever i do, i keep getting the same error.
I've attached a log, maybe it will clarify .

--
Willy-Bas Loos
Attachment

pgadmin-support by date:

Previous
From: Murtuza Zabuawala
Date:
Subject: Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)
Next
From: Douglas Reed
Date:
Subject: PgAdmin4 - Session Timeout - Due to cloud behaviour