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

Add an integration strategy to merge tickets fast-forward or with commit #218

Closed
wants to merge 2 commits into
base: develop
from

Conversation

Projects
None yet
2 participants
@fzs
Collaborator

fzs commented Sep 7, 2014

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-forward if possible, otherwise with a merge commit.

fzs added some commits Jun 21, 2014

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.
Add merge type setting to repository page.
The merge type is a per repository setting. Add it to the edit page.
@gitblit

This comment has been minimized.

Show comment
Hide comment
@gitblit

gitblit Sep 7, 2014

Owner

Pushed to ticket 104. Will review in more detail later. @davido will probably want to chime-in too.

Owner

gitblit commented Sep 7, 2014

Pushed to ticket 104. Will review in more detail later. @davido will probably want to chime-in too.

@fzs

This comment has been minimized.

Show comment
Hide comment
@fzs

fzs Sep 7, 2014

Collaborator

Ah. Ya, I'm not used to dev.gitblit.com yet, I wasn't aware there is already a ticket. (So many places to check for Gitblit.) This is a first go which concentrates on the simple things. I left out cherry-picking and automated rebases. I had this sitting around for a while, it took me some time to finally create a PR from it.

Collaborator

fzs commented Sep 7, 2014

Ah. Ya, I'm not used to dev.gitblit.com yet, I wasn't aware there is already a ticket. (So many places to check for Gitblit.) This is a first go which concentrates on the simple things. I left out cherry-picking and automated rebases. I had this sitting around for a while, it took me some time to finally create a PR from it.

gitblit added a commit that referenced this pull request Nov 5, 2014

@gitblit gitblit closed this Nov 23, 2015

@fzs fzs referenced this pull request Oct 28, 2016

Merged

Merge strategy #1142

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment