Is there an option(s) when doing
git pull --quit_if_possible_merge
git pull --ff-only
If what has been said in the other answers is true, this should have exactly the desired effect. No?
--ff-only flag stands for "fast-forward" which is how Git refers to a situation in which one of the merging branches contains all of the commits of the other ( a strict superset ). This is special because it means no merge conflicts are possible. The commit so on the branch that is ahead simply get added to other branch and everyone is happy.