[
https://ovirt-jira.atlassian.net/browse/OVIRT-1296?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=30223#comment-30223
]
Barak Korren edited comment on OVIRT-1296 at 5/1/17 10:12 PM:
--------------------------------------------------------------
We should close this ticket, i don`t think its gonna be useful for anything.
Read my comment above.
'Rebase always' is just like 'Rebase when necessary' for all practical
purposes, only it guarantees that the commit that ends up being merged will
always be different then the one the developer that wrote it has locally. This
will just be annoying.
was (Author: bkor...@redhat.com):
We should close this ticket, i don`t think its gonna be useful for anything.
Read my comment above.
'Rebase always' is just like 'Rebase when necessary' fir all practical
purposes, only it guarantees that the commit that ends up being merged will
always be different then the one the developer that wrote it has locally. This
will just be annoying.
> review Rebase Always submit strategy on Gerrit
> ----------------------------------------------
>
> Key: OVIRT-1296
> URL: https://ovirt-jira.atlassian.net/browse/OVIRT-1296
> Project: oVirt - virtualization made easy
> Issue Type: Improvement
> Reporter: Evgheni Dereveanchin
> Assignee: infra
> Priority: Lowest
>
> A new submit strategy was included in recent builds of Gerrit: Rebase Always.
> [Docs|https://gerrit-review.googlesource.com/Documentation/project-configuration.html#rebase_always]:
> {quote}Basically, the same as Rebase If Necessary, but it creates a new
> patchset even if fast forward is possible AND like Cherry Pick it ensures
> footers such as Change-Id, Reviewed-On, and others are present in resulting
> commit that is merged.
> Thus, Rebase Always can be considered similar to Cherry Pick, but with the
> important distinction that Rebase Always does not ignore dependencies.{quote}
> It is only available in
> [2.14|https://gerrit.googlesource.com/gerrit/+/stable-2.14/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/]
> while we are still at 2.12 and
> [2.13|https://gerrit.googlesource.com/gerrit/+/stable-2.13/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/]
> is the current stable branch.
--
This message was sent by Atlassian JIRA
(v1000.929.1#100040)
_______________________________________________
Infra mailing list
Infra@ovirt.org
http://lists.ovirt.org/mailman/listinfo/infra
