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

[Duncan Roe]

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:

> Auto-merging system/spman/spman.info
> CONFLICT (add/add): Merge conflict in system/spman/spman.info

> less -N system/spman/spman.info
>  1 PRGNAM="spman"
>  2 <<<<<<< HEAD
>  3 VERSION="1.5.3"
>  4 HOMEPAGE="https://github.com/MyRequiem/spman"
>  5 DOWNLOAD="https://github.com/MyRequiem/spman/archive/1.5.3/spman-1.5.3.tar.gz"
>  6 MD5SUM="b43a1def97283d7346ce88bd217a0e24"
>  7 =======
>  8 VERSION="1.5.4"
>  9 HOMEPAGE="https://github.com/MyRequiem/spman"
> 10 DOWNLOAD="https://github.com/MyRequiem/spman/archive/1.5.4/spman-1.5.4.tar.gz"
> 11 MD5SUM="9096f25e2909be7ca3b8823b53f82699"
> 12 >>>>>>> a31868bb76cca8c30498b60dc2fd685c64bfe00a
> 13 DOWNLOAD_x86_64=""
> 14 MD5SUM_x86_64=""
> 15 REQUIRES="python3"
> 16 MAINTAINER="Vladimir MyRequiem"
> 17 EMAIL="mrvladislavovich at gmail.com"

Where's the conflict in that? It's just a straightforward update.

Anyone have any idea what's going on here?

Cheers ... Duncan.