On Fri, 15 Jun 2018 12:06:01 +1000 Duncan Roe <duncan_...@optusnet.com.au> wrote:
> Hi everyone, > > I just did a git pull in my clone of > git://git.slackbuilds.org/slackbuilds.git and every single change was > reported as a conflict. I checked the first one: > > ... > > Where's the conflict in that? It's just a straightforward update. > > Anyone have any idea what's going on here? https://lists.slackbuilds.org/pipermail/slackbuilds-users/2018-June/021612.html and https://lists.slackbuilds.org/pipermail/slackbuilds-users/2018-June/021605.html -RW
pgph8KfkFhbuo.pgp
Description: OpenPGP digital signature
_______________________________________________ SlackBuilds-users mailing list SlackBuilds-users@slackbuilds.org https://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users Archives - https://lists.slackbuilds.org/pipermail/slackbuilds-users/ FAQ - https://slackbuilds.org/faq/
