dim: FAILURE: Could not merge drm-intel/drm-intel-next-queued

[Jani Nikula]

On Mon, 09 Oct 2017, Noralf Trønnes <noralf at tronnes.org> wrote:
> Den 09.10.2017 22.37, skrev Jani Nikula:
>> What's your git version?
>>
>> What does 'cat ~/drm-linux/drm-tip/.git' say?
>
> notro at agl:~/drm-linux/drm-tip$ git --version
> git version 2.7.4

That might explain the conflict. git versions are known to have slightly
different conflicts. Vesion 2.11.0 here, and dim rebuild-tip worked just
fine.

> notro at agl:~/drm-linux/drm-tip$ cat ~/drm-linux/drm-tip/.git
> gitdir: /home/notro/drm-linux/src/.git/worktrees/drm-tip

Odd. Did you not have ssh:// remote to drm-tip previously? How did you
push it...?

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center