diff options
| author | Florian Zschocke <florian.zschocke@cycos.com> | 2014-06-21 02:53:21 +0200 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@cycos.com> | 2014-09-07 22:40:17 +0200 |
| commit | eb252616d18811e611fe10f048fb9b04460df671 (patch) | |
| tree | f98f9b6c6a9e6b24d8e9637f4ab41cab9fdd89ec /.checkstyle | |
| parent | f7174e6984c08a153d1ba198c4bffe68c5afd873 (diff) | |
| download | gitblit-eb252616d18811e611fe10f048fb9b04460df671.tar.gz gitblit-eb252616d18811e611fe10f048fb9b04460df671.zip | |
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.
Diffstat (limited to '.checkstyle')
0 files changed, 0 insertions, 0 deletions