From 8ccc832bf6c7c29eb36396f0fc9e33dcfe037d64 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 18 Jun 2015 10:19:29 +1000 Subject: [PATCH] do_merge: Print if fixes exist when merge fails --- do_merge | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/do_merge b/do_merge index 0ad0d44..0dfa7d5 100755 --- a/do_merge +++ b/do_merge @@ -134,6 +134,10 @@ for h in $heads; do git diff 2>&1 | egrep -q '<<<<<|^\*' && { notify-send -t 0 -u critical "linux-next new conflict found merging $tree!" pushover "linux-next new conflict found merging $tree!" + if [ -f "../merge-fixes/$tree" ]; then + echo "Merge fixes exist for this tree:" + cat "../merge-fixes/$tree" + fi bash -i || exit } # [ "$(git status --porcelain)" ] && { -- 2.39.5