Makes sense to me to put it on a branch and then merge the branch once we're happy with it.
Gj On Thu, Jun 21, 2018 at 10:00 PM, Emilian Bold < [email protected]> wrote: > No, no, no, I want to keep the existing repository. > > Actually I just looked and there's 'git checkout --orphan' to create a > branch without a parent. > > So, we create an orphan branch, add the 2nd donation, then merge this > branch to master/. Makes sense? > > --emi > > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ > > On 21 June 2018 10:52 PM, Antonio <[email protected]> wrote: > > > Some thoughts/questions: > > > > - Do we want another git repository for the 2nd donation? This is, > > > > what are the advantages/disadvantages of using the same git > repository? > > > > - In fact, do we want different repos for different clusters? (PHP / > > > > JavaEE, etc.?) > > > > (AFAIK there was a "Experiment: split the main NetBeans repository" > at > > > > [1], maybe there's something to learn from that experiment?). > > > > - Do we want to finish the "Per Cluster Repository Layout" [2] before > > > > importing? > > > > Cheers, > > > > Antonio > > > > [1] > > > > https://cwiki.apache.org/confluence/display/NETBEANS/ > Experiment%3A+split+the+main+NetBeans+repository > > > > [2] > > > > https://github.com/apache/incubator-netbeans/pull/536 > > > > On 21/06/18 12:42, Emilian Bold wrote: > > > > > > > Hello, > > > > > > The 2nd donation is arriving and I wonder how to best import it. > > > > > > I think it should be a separate branch which we merge into master. > > > > > > But how to we preserve the full history? > > > > > > The end of the README here https://github.com/apache/ > incubator-netbeans/blob/master/README.md mentions how to do a 'git > replace' to 'stitch' back the history. > > > > > > I suspect that the 2nd donation should be a new branch with not > parents. Then we merge it into master. > > > > > > Thus, we can do 'git replace' on the 2nd donation branch too. > > > > > > What do you think? > > > > > > --emi > > > > > > To unsubscribe, e-mail: [email protected] > > > > > > For additional commands, e-mail: [email protected]. > apache.org > > > > > > For further information about the NetBeans mailing lists, visit: > > > > > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > > -- > > > > To unsubscribe, e-mail: [email protected] > > > > For additional commands, e-mail: [email protected] > > > > For further information about the NetBeans mailing lists, visit: > > > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > >
