| | | 
| | 
| | 
| | 
| | 
| | 
| |  | 
Instead of using git merge --no-ff which always ensure no conflict, try
to git merge covering simple cases (and automatically resolvable ones)
at the cost of a merge commit but abort in case of conflicts needing
manuable resolution.
 |