Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge strategy #1142

Merged
merged 2 commits into from Oct 28, 2016
Merged

Merge strategy #1142

merged 2 commits into from Oct 28, 2016

Conversation

flaix
Copy link
Collaborator

@flaix flaix commented Oct 28, 2016

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.

flaix added 2 commits Oct 28, 2016
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.
The merge type is a per repository setting. Add it to the edit page.
@gitblit gitblit merged commit d64dd5d into gitblit:master Oct 28, 2016
@gitblit
Copy link
Owner

@gitblit gitblit commented Oct 28, 2016

Looks good and a reasonable request.

@flaix flaix added this to the 1.9.0 milestone Dec 13, 2016
@flaix flaix deleted the merge-strategy branch Jun 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants