|
@@ -13,7 +13,7 @@ result="${3}"
|
|
|
|
|
|
|
|
if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
|
|
if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
|
|
|
echo "MERGE_MSG: Merge ${path} from ${repo}"
|
|
echo "MERGE_MSG: Merge ${path} from ${repo}"
|
|
|
- notify-send -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
|
|
|
|
|
|
|
+ notify-send -t 0 -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
|
|
|
while true; do
|
|
while true; do
|
|
|
echo "Resolve current index then press Enter..."
|
|
echo "Resolve current index then press Enter..."
|
|
|
read
|
|
read
|