| From: | Willy-Bas Loos <willybas(at)gmail(dot)com> |
|---|---|
| To: | Murtuza Zabuawala <murtuza(dot)zabuawala(at)enterprisedb(dot)com> |
| Cc: | pgAdmin Support <pgadmin-support(at)postgresql(dot)org> |
| Subject: | Re: Multiple head revisions after git pull (2.0rc1 --> 2.0) |
| Date: | 2017-11-03 13:36:39 |
| Message-ID: | CAHnozTiKiOjTMUvQhnnMogskmwh7HUyLHNR17ds03S_CyVQNhA@mail.gmail.com |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgadmin-support |
On Fri, Nov 3, 2017 at 1:14 PM, Murtuza Zabuawala <
murtuza(dot)zabuawala(at)enterprisedb(dot)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 | Content-Type | Size |
|---|---|---|
| merge-head.log | text/x-log | 16.8 KB |
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Douglas Reed | 2017-11-03 13:43:40 | PgAdmin4 - Session Timeout - Due to cloud behaviour |
| Previous Message | Murtuza Zabuawala | 2017-11-03 12:14:01 | Re: Multiple head revisions after git pull (2.0rc1 --> 2.0) |