| Re: [mylyn-dev] stop requiring fast-forwards |
Thanks for the replies. There is already a rebase button (in the Mylyn connector too) but I still find it painful.that sounds good to me but what are you suggesting as an alternative? I'm okay with a cherry-pick merge strategy. I'm not a big fan of merge commits though since that makes the history more difficult to follow.Agreed, I don't like merge commits. I would like to use either cherry-pick or Rebase If Necessary. It sounds like the only differences are that cherry-pick always creates a new commit when merging, and it adds information to the commit header. Rebase if Necessary only creates a new commit when necessary.On Wed, Dec 10, 2014 at 1:33 AM, Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:if webmaster would fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=441011you could rebase by clicking "Rebase" in the Gerrit UI which makes fast-forward-only strategy less painful--MatthiasOn Wed, Dec 10, 2014 at 10:14 AM, Steffen Pingel <steffen.pingel@xxxxxxxxxxx> wrote:Hi,that sounds good to me but what are you suggesting as an alternative? I'm okay with a cherry-pick merge strategy. I'm not a big fan of merge commits though since that makes the history more difficult to follow.SteffenOn Wed, Dec 10, 2014 at 12:29 AM, Sam Davis <sam.davis@xxxxxxxxxxx> wrote:_______________________________________________Cheers,Does anyone object? If not, does anyone know whether it's possible to change this configuration at the project level?Hi,I would like to propose that we stop requiring fast-forwards when submitting Gerrit reviews for Mylyn. It's quite annoying when there are several changes happening at once. The chance of two concurrent commits having a semantic conflict without a syntactic conflict, and without the authors being aware of it, are low. And if it does happen on rare occasions, it's easy enough to revert or fix the change. Other git repositories I work with do not require fast forwards and we've never had any problems.
Sam
mylyn-dev mailing list
mylyn-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mylyn-dev--
_______________________________________________
mylyn-dev mailing list
mylyn-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mylyn-dev
_______________________________________________
mylyn-dev mailing list
mylyn-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mylyn-dev
_______________________________________________
mylyn-dev mailing list
mylyn-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mylyn-dev