datasift/gitflow — pull request #7 by stuartherbert (2012-05-17 15:05:27+00:00)
Title: Reduce merge conflicts when merging into master

* When merging into master branch, give a hint to the merge engine to
tell it that we prefer the hotfix or release to take precedence
where possible.

Source: https://github.com/nvie/gitflow/pull/153