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