But that shows the problem as well with tools -- if I use the command line for Git, I know exactly what I'm doing, while with tools you don't know exactly what's going on under the hood, which is a bit dangerous when merging branches in non trivial projects etc.
Gj On Tue, Jul 31, 2018 at 6:06 PM, Geertjan Wielenga < [email protected]> wrote: > :-) That's a good tip, thanks James. > > Gj > > On Tue, Jul 31, 2018 at 5:45 PM, James Gosling <[email protected]> wrote: > >> There is a nice GUI for exactly this…. In NetBeans. I’ve used it for >> years. :-) >> >> > On Jul 31, 2018, at 8:02 AM, Peter Steele <[email protected]> wrote: >> > >> > You do it locally on your own PC, clone master, pull in chosen branch, >> > commit and push. I don't know of a way to do it on the GitHub site, >> using >> > git commands is easiest. There is probably a gui to do this too >> > >> > On Tue, 31 Jul 2018 15:58 Geertjan Wielenga, >> > <[email protected]> wrote: >> > >> >> Apologies for my ignorance, but should someone do this in their own >> clone >> >> or should it be done directly in >> >> https://github.com/apache/incubator-netbeans? >> >> >> >> Gj >> >> >> >> On Tue, Jul 31, 2018 at 4:45 PM, Peter Steele <[email protected]> >> >> wrote: >> >> >> >>> https://help.github.com/articles/merging-an-upstream- >> >>> repository-into-your-fork/ >> >>> >> >>> On Tue, 31 Jul 2018 15:41 Geertjan Wielenga, >> >>> <[email protected]> wrote: >> >>> >> >>>> Is there a way to merge the branch into master on GitHub? >> >>>> >> >>>> Or is there someone who can recommend best practices for doing this? >> >>>> >> >>>> Thanks, >> >>>> >> >>>> Gj >> >>>> >> >>>> >> >>>> On Tue, Jul 31, 2018 at 4:16 PM, Josh Juneau <[email protected]> >> >>> wrote: >> >>>> >> >>>>> Looking forward to getting started with the work on this 2nd >> >> donation. >> >>>>> >> >>>>> On Tue, Jul 31, 2018 at 3:09 AM Geertjan Wielenga >> >>>>> <[email protected]> wrote: >> >>>>> >> >>>>>> Is there any objection to merging the 2nddonation branch into >> >> master >> >>>>> today? >> >>>>>> >> >>>>>> https://github.com/apache/incubator-netbeans/tree/2ndDonation >> >>>>>> >> >>>>>> Gj >> >>>>>> >> >>>>>> On Sun, Jul 29, 2018 at 9:44 PM, Geertjan Wielenga < >> >>>>>> [email protected]> wrote: >> >>>>>> >> >>>>>>> Is there anything stopping us from merging the 2nd donation >> >> branch >> >>>> into >> >>>>>>> master? >> >>>>>>> >> >>>>>>> If not, let's do it, then take a look at the Rat report after the >> >>>> first >> >>>>>>> build that includes the branch, and see what kind and how many >> >>>> problems >> >>>>>> are >> >>>>>>> identified and how to solve them. >> >>>>>>> >> >>>>>>> Thanks, >> >>>>>>> >> >>>>>>> Gj >> >>>>>>> >> >>>>>>> >> >>>>>>> >> >>>>>>> On Thu, Jul 26, 2018 at 11:00 PM, Antonio <[email protected]> >> >>>> wrote: >> >>>>>>> >> >>>>>>>> That's easy: I still own one of the NetBeans Day in 2004 >> >>>> somewhere... >> >>>>>>>> >> >>>>>>>> El 26/07/2018 a las 22:58, Emilian Bold escribió: >> >>>>>>>> >> >>>>>>>>> We just need some tshirts to gift people :-) >> >>>>>>>>> >> >>>>>>>>> --emi >> >>>>>>>>> >> >>>>>>>>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ >> >>>>>>>>> On 26 July 2018 11:57 PM, Antonio <[email protected]> wrote: >> >>>>>>>>> >> >>>>>>>>> Yep, but on august. Let's call it Hacktaugustfest or something >> >>> :-) >> >>>>>>>>>> >> >>>>>>>>>> El 26/07/2018 a las 22:40, Emilian Bold escribió: >> >>>>>>>>>> >> >>>>>>>>>> Isn't this what we did with #Hacktoberfest 2017? >> >>>>>>>>>>> --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 >> >>>>>>>> >> >>>>>>>> >> >>>>>>>> >> >>>>>>>> >> >>>>>>> >> >>>>>> >> >>>>> -- >> >>>>> Josh Juneau >> >>>>> [email protected] >> >>>>> http://jj-blogger.blogspot.com >> >>>>> https://www.apress.com/index.php/author/author/view/id/1866 >> >>>>> >> >>>> >> >>> >> >> >> >> >> --------------------------------------------------------------------- >> 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 >> >> >> >> >
