conflicts with master

[Jan Stary]

On Jun 02 15:30:53, raimue at macports.org wrote:
> On 2018-06-02 08:25, Jan Stary wrote:
> > $ git log -1
> > 33mcommit 101e557b4b08974559402a3c5cf6e247561ef5e7m33m (m1;36mHEAD -> m1;32mmasterm33m, m1;31morigin/masterm33m, m1;31mm33mm33mm1;36mm1;32mm33mm1;31mm33mm1;31morigin/HEADm33m)mm
> > Author: Ryan Schmidt <ryandesign at macports.org>
> > Date:	Tue May 22 00:49:11 2018 -0500
> > 
> >     py-ligo-common: license GPL-3+m
> 
> That is not the correct commit hash as it is in the
> macports/macports-ports repository, which would be
> e5e6d7e70131472312e84d6985773153dacecf78 [1].
> 
> Did you accidentally rebase on top of local changes before?

I must have, thanks for the hint.

> Try to clean up your master branch with:
> $ git pull --rebase upstream master

Yes, that did it.

	Thank you!

		Jan

> There was a similar problem recently on macports-dev. Maybe the
> explanation [2] helps you as well.
> 
> Rainer
> 
> [1]
> https://github.com/macports/macports-ports/commit/e5e6d7e70131472312e84d6985773153dacecf78
> [2] https://lists.macports.org/pipermail/macports-dev/2018-May/038766.html