On 03/27/2013 11:04 PM, Adam Litke wrote: > I would like to change the policy of the mom project to Cherry Pick > commits instead of requiring fast-forward. Can you update the project > settings please? > which value for Automatically resolve conflicts?