Re: [mylyn-dev] stop requiring fast-forwards

[Matthias Sohn <matthias.sohn@xxxxxxxxx>]

if webmaster would fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=441011

you could rebase by clicking "Rebase" in the Gerrit UI which makes fast-forward-only strategy less painful

--

Matthias

On 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.

Steffen

On Wed, Dec 10, 2014 at 12:29 AM, Sam Davis <sam.davis@xxxxxxxxxxx> wrote:

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.

Does anyone object? If not, does anyone know whether it's possible to change this configuration at the project level?

Cheers,
Sam

--
Sam Davis
Software Engineer, Tasktop Dev
Committer, Eclipse Mylyn
http://tasktop.com

_______________________________________________
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

--

Steffen Pingel
Principal Software Engineer, Eclipse Mylyn
Mylyn Tasks Lead
http://tasktop.com

_______________________________________________
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