On Thu, Jun 21, 2018 at 12:42 PM, Emilian Bold < [email protected]> 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? > Yes, I think we want to be able to join histories (might be easiest to start with an empty repository, place the code there, possibly on a branch, and merge to master). One more aspect to consider is, do we place the 2nd donation code to: -incubator-netbeans, master branch -incubator-netbeans, some other branch -a new copy of incubator-netbeans I don't think there's a strong technical reason for either of these variants (we wouldn't by default build and release the new clusters/modules, until they are reviewed, so these wouldn't/shouldn't be subject to the license checks.) Jan > > --emi > > > --------------------------------------------------------------------- > 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 > > > >
