[Slackbuilds-users] Why did git report everything as a conflict lust now?

Robby Workman rworkman at slackbuilds.org
Fri Jun 15 03:02:41 UTC 2018

On Fri, 15 Jun 2018 12:06:01 +1000
Duncan Roe <duncan_roe at 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?




-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: OpenPGP digital signature
URL: <http://lists.slackbuilds.org/pipermail/slackbuilds-users/attachments/20180614/c2087eeb/attachment.asc>

More information about the SlackBuilds-users mailing list