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

[Noralf Trønnes]

Den 10.10.2017 00.09, skrev 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...?

I used: dim push-branch drm-misc-next

I have updated git and got version 2.14.2.

If you don't need me to do any forensics here to improve dim, I think
I'll just kill off this installation and start off with a fresh: dim setup.

Noralf.


> BR,
> Jani.
>