I'm using a VS-TFS 2015 to manage my project and I've enabled pull-request and using branch policies.
For manage the pull-request, I want that merges to develop branch (there is a Git Repo ahead) are done with no-ff option. In the MSDN (https://learn.microsoft.com/fr-fr/vsts/git/branch-policies#enforce-a-merge-strategy), there is a "Enforce a merge strategy" section but that does not appear in my TFS-2015 Dashboard.
Any ideas to enable that or a workaround ? I supose that no-ff is not activated by default when we validate a merge pull-request ?
Upgrade to a newer version of TFS. Merge strategies were not available in TFS 2015.