Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [mylyn-docs-dev] Ouch... Unintentional merge

Thanks David,

Yes, it looks good now :-)

Best regards,
Torkild

26. mars 2014 kl. 15:34 skrev David Green <david.green@xxxxxxxxxxx>:

> Torkild,
> 
> Don't sweat the unintended merge - we've all done it.  I see that you've also merged a fix for the problem so unless I hear otherwise I'll assume that you've got it under control.  Let me know if you need anything from me.
> 
> David
> 
> 
> On Wed, Mar 26, 2014 at 2:42 AM, Steffen Pingel <steffen.pingel@xxxxxxxxxxx> wrote:
> Changing EPUB back to 2.0 makes sense to me. The version that is part of Mylyn 3.11 is org.eclipse.mylyn.docs.epub_1.3.0.v20131106-0812 so 2.0 should be the next release version. We may need some changes to the versions script to avoid unintentional bumps in the next release cycle (i.e. update versions on a per component basis rather than across the entire code base). 
> 
> Steffen  
> 
> 
> On Wed, Mar 26, 2014 at 9:07 AM, Torkild Ulvøy Resheim <torkildr@xxxxxxxxx> wrote:
> I just noticed that in my wrongful merge the EPUB versions had been bumped to 2.1 - this should have been left at 2.0 as the previous version was 1.3 and there had been breaking API changes. Unless there are any protests I'd like to change this back to 2.0 (otherwise I need to update a few @since tags).
> 
> Best regards,
> Torkild
> 
> 26. mars 2014 kl. 08:52 skrev Torkild Ulvøy Resheim <torkildr@xxxxxxxxx>:
> 
> > Hi all,
> >
> > It appears I did a mistake. Adding a comment to https://git.eclipse.org/r/#/c/23890/ and pressing comment and submit merged the change instead of just commenting it. I'm sorry about that. Should I  attempt to fix it?
> >
> > Best regards,
> > Torkild
> 
> _______________________________________________
> mylyn-docs-dev mailing list
> mylyn-docs-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-docs-dev
> 
> 
> 
> -- 
> Steffen Pingel
> Principal Software Engineer, Eclipse Mylyn
> Mylyn Tasks Lead
> http://tasktop.com
> 
> _______________________________________________
> mylyn-docs-dev mailing list
> mylyn-docs-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-docs-dev
> 
> 
> 
> 
> -- 
> David Green
> VP of Architecture, Tasktop
> Committer, Eclipse Mylyn
> http://tasktop.com 
> +1-778-588-6896 ext. 115
> 
> _______________________________________________
> mylyn-docs-dev mailing list
> mylyn-docs-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-docs-dev



Back to the top