166 votes23 comments · Azure DevOps (formerly Visual Studio Team Services) » Version Control (Git/TFVC) · Flag idea as inappropriate… · Admin →John commented
VSTS should support all git merge policies:- "no ff", "ff if possible" (default) and "ff only".
The merge policy should be configurable per-branch.
If this can be done by simply reflecting the git config/attribute settings (as Frode suggested) that would seem cleanest.
Failure to support all merge modes is a barrier to adoption. For example we require "ff-only" on some branch types.John supported this idea ·