extract-and-notify-merge-conflicts this small shell script try to merge 2 branches .. in case of conflict it notifies the user by mail