I use this command:
git merge --commit -m="Automatic commit" --progress my_branch/master
if [ $? != 0 ]; then
echo "Merge fail"
fi
The merger was successful and did not cause conflict.
The output of the git command:
Automatic merge went well; stopped before committing as requested
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
Why is this shown: stopped before committing as requested ? I want him to fix if there is no conflict.
Any idea to do this automatically?
source
share