Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Merge strategy #1142
This is pull request #218 reopened. The PR has been closed unmerged for two years now, but there is no work on ticket 104 either. In order to move this forward a little I have rebased the original changes on master. It only implements part of ticket 104, namely "Fast Forward Only", "Merge If Necessary" and "Always Merge". I would request to merge that much already, even if it doesn't fully cover ticket 104.
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.