tree f98f9b6c6a9e6b24d8e9637f4ab41cab9fdd89ec
parent f7174e6984c08a153d1ba198c4bffe68c5afd873
author Florian Zschocke <florian.zschocke@cycos.com> 1403312001 +0200
committer Florian Zschocke <florian.zschocke@cycos.com> 1410122417 +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.