Happened again so I unlazied and typed this up finally. v2: - better formatting - git pull, to avoid conflicts when you don't have latest drm-rerere.
Cc: Dave Airlie <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> --- drm-tip.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drm-tip.rst b/drm-tip.rst index 133ef1699b92..002246f573e3 100644 --- a/drm-tip.rst +++ b/drm-tip.rst @@ -79,6 +79,27 @@ when it's tricky or something fails in the below procedure. And if any step fails or the conflict is tricky just ping maintainers. +Removing a Wrong Conflict Resolution +------------------------------------ + +Occasionally someone screws up and pushes a broken merge conflict resolution to +drm-tip. Getting rid of that requires a few steps. + +1. First identify which commit in the drm-rerere branch contains the bad merge + resolution. If you know who pushed the bad merge then searching by author is + easiest, otherwise figure out which stored resolution is the wrong one. + +2. Revert that commit and make sure there's no other cache resolutions around:: + + $ cd $DIM_PREFIX/drm-rerere + $ git pull # to avoid with others + $ git revert $broken_resolution_sha1 + $ git clean -dfx + +3. Re-resolve the conflict and try to get it right this time around:: + + $ dim rebuild-tip + If the Conflict Reappears ------------------------- -- 2.20.0.rc1 _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
