Your pgAdmin4 repo has local alembic revisions and you have to fix it manually by removing its respective files from directory '../pgadmin4/web/migrations/versions', you can refer below given link how to do it manually OR if you are having difficulties doing it I would suggest you to git clone the pgAdmin4 repo once again.
alembic documents for merging two heads http://alembic.zzzcomputing. com/en/latest/branches.html#merging-branches -- Murtuza On Fri, Nov 3, 2017 at 7:06 PM, Willy-Bas Loos <willy...@gmail.com> wrote: > On Fri, Nov 3, 2017 at 1:14 PM, Murtuza Zabuawala < > murtuza.zabuaw...@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 >
