Re: [eclipse-dev] Eclipse Juno M6 N&N needed by Wed. March 14 - Instruct

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

Git is reasonably good at handling merges,
and I usually only get input from 3 or 4 people. I have also created sections
in the document for each team already, so conflicts should be resolved
automatically in most cases. I suggest we try it this way, and if it is
painful we can switch to contributing multiple files that I combine at
the end. 

John

Deepak Azad <deepak.azad@xxxxxxxxxx>
Sent by: eclipse-dev-bounces@xxxxxxxxxxx

03/08/2012 11:15 AM

Please respond to
"General development mailing list of the Eclipse project."        <eclipse-dev@xxxxxxxxxxx>

To	"General development mailing list of the Eclipse project." <eclipse-dev@xxxxxxxxxxx>
cc
Subject	Re: [eclipse-dev] Eclipse Juno M6 N&N needed by Wed. March 14        -        Instructions Changed!!

Is everyone supposed to directly edit the one file
mentioned? Given that
everyone would be writing N&N on the same day wouldn't this result
in merge
conflicts for many people and as a result wasted time?

I think a better model could be to create a directory per component and
each component creates their separate N&N which are merged in the end,
as
used to happen so far.

Deepak



From:                
John Arthorne <John_Arthorne@xxxxxxxxxx>
To:                
eclipse-dev@xxxxxxxxxxx
Date:                
03/08/2012 01:14 AM
Subject:                
[eclipse-dev] Eclipse Juno M6 N&N needed by Wed. March 14 -
            Instructions Changed!!
Sent by:                
eclipse-dev-bounces@xxxxxxxxxxx



Committers,

NOTE! THIS IS NOT THE USUAL EMAIL. PLEASE READ IT.

Please coordinate with your component team lead and push your new and
noteworthy items for Eclipse Juno (3.8 & 4.2) M6 by Wed. March 14.
I'll
edit your contributions to produce an HTML document that will accompany
the
milestone build when it wraps on Friday.

Please push your new & noteworthy items directly to the git repository:

http://git.eclipse.org/c/platform/eclipse.platform.news.git/tree/platform/4.2/M6/eclipse-news-M6.html


This doesn't mean you can wait until Friday to push your contributions.
The
document still needs to be edited and exported to the downloads page which
takes some time. Changes pushed to the New & Noteworthy after we promote
the build will not be included.

Thanks,
John_______________________________________________
eclipse-dev mailing list
eclipse-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit
https://dev.eclipse.org/mailman/listinfo/eclipse-dev


_______________________________________________
eclipse-dev mailing list
eclipse-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit
https://dev.eclipse.org/mailman/listinfo/eclipse-dev