Hello, Thank you again for your patience on this. We have cleaned up the commits and as a result the diffs on the merge request, and thanks to your tips and links were more able to fully test the new features.
Please let us know if you see any additional issues with the merge. https://sourceforge.net/p/freecol/git/merge-requests/40/ Thanks again, -Mike > On Tue, 6 Dec 2016 09:50:11 -0500 > Dong Kim <dong...@andrew.cmu.edu> wrote: >> Sounds awesome, thanks for all your help! It was a great experience >> overall. > > Not entirely. I just grabbed the merge, and it is very hard for me to > work out what you have done because of all the code reformatting. In > particular, there are TABs everywhere, which we explicitly ask *not* to be > used in FreeCol code contributions. Look at AbstractGoodsLabel to see > what I mean --- AFAICT there you have added a new field and setter/getter > methods for it, but "git diff" shows almost all of the file is changed! I > strongly encourage you to put in another merge request that contains > *only* what needs to change to implement the features. As things stand I > can not merge without a lot of extra tedious work. > > Cheers, > Mike Pope > > ------------------------------------------------------------------------------ > Developer Access Program for Intel Xeon Phi Processors > Access to Intel Xeon Phi processor-based developer platforms. > With one year of Intel Parallel Studio XE. > Training and support from Colfax. > Order your platform > today.http://sdm.link/xeonphi_______________________________________________ > Freecol-developers mailing list > Freecol-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/freecol-developers > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
