tree 1c2262cc18f54fa0d08579abbdd109dc3a9b54aa
parent d10fe0d8fd614f6ae6606179b0326bdc6a5f6af8
author Florian Zschocke <florian.zschocke@cycos.com> 1403312001 +0200
committer Florian Zschocke <florian.zschocke@devolo.de> 1477645345 +0200

Add integration strategy to merge tickes 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-foward if possible, otherwise with a merge commit.

Adds a new property ticket.mergeType with the valid values
FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY.

Merging and canMerge were refactored to make use of a new
IntegrationStrategy class for each type of strategy.