[PATCH] dim: make update-branches update drm-next

[Joonas Lahtinen]

Quoting Jani Nikula (2018-03-01 17:39:36)
> On Thu, 01 Mar 2018, Joonas Lahtinen <joonas.lahtinen at linux.intel.com> wrote:
> > Update drm-next branch if it exists, to avoid incomplete backmerges.
> 
> Oh, so you did the backmerge from the *local* branch instead of
> drm-upstream/drm-next? Don't do that then...!

Gee, of course, as after update-branches, all the branches are supposed
to be equal!

This is some good stuff that could be read in docs ;) (If one had had
them).

> 
> Should we prevent backmerges from local branches in dim?

Either way. I might incline to making sure all the branches are in sync
with update-branches before doing backmerge. Then doing some git history
comparasions will be easier after the backmerge is applied.

Regards, Joonas