[PATCH 2/5] dim: auto-commit in apply-pull if rerere solved it all

[Dave Airlie]

On 5 May 2018 at 00:10, Jani Nikula <jani.nikula at linux.intel.com> wrote:
> On Fri, 04 May 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>> Now that we experiment with dim for drm-next it's much more likely
>> that pull requests have conflicts. But also that dim already knows
>> about them, in the recent drm-intel-next pull it resolve 7/8
>> conflicts.
>
> I'll bet rerere will be really appealing for Dave. But until now we've
> been able to shrug off potential bogus conflict resolutions with the
> thought that it's just for drm-tip and not for real. Now it'll be for
> real. *gasp*.

Yeah I do have this worry myself, I spend a lot of time with git log, blame
on every conflict I get to make sure I can definitely say I tried to
understand it,
I have to trust that others are going to put this sort of effort in,
esp for drivers
that aren't theirs.

Dave.