Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)

Поиск
Список
Период
Сортировка
От Willy-Bas Loos
Тема Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)
Дата
Msg-id CAHnozTiKiOjTMUvQhnnMogskmwh7HUyLHNR17ds03S_CyVQNhA@mail.gmail.com
обсуждение исходный текст
Ответ на Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)  (Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>)
Ответы Re: Multiple head revisions after git pull (2.0rc1 --> 2.0)
Список pgadmin-support
Дерево обсуждения
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
Вложения

В списке pgadmin-support по дате отправления: