Skip to content
Snippets Groups Projects
Commit 11d85afd authored by Simona Vetter's avatar Simona Vetter
Browse files

dim: auto-commit in apply-pull if rerere solved it all


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.

If it solves them all then just go ahead an commit.

v2: Conflict howto is now in drm-tip.rst (Jani).

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent c0c4dc1c
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment