Add an integration strategy to merge tickets fast-forward or with commit

Add the option to merge a ticket branch to the integration branch
only when it can be fast-forwarded, or
always with a merge commit, or
by fast-forward if possible, otherwise with a merge commit.