[Date Prev][Date Next] [Chronological] [Thread] [Top]

Re: openldap.git branch master updated. cf49e43f86de16f1cc84ab44f6d4fa3c7e18902f

Kurt Zeilenga writes:
> I'm not sure why his merge was needed.  Likely I goofed.  I think it
> was a no-op.

Ah.  Well, we'll have more glitches I'm sure.

'gitk --all' or 'git log --graph' shows you did 'Update guide
Copyright/License handling' in one branch and 'Update configure' +
Update for git' in another.  I.e. didn't pull the first before
committing/pushing the second.