On Thu, 21 Jan 2016 14:49:29 -0500, Matt McCormick said: >> I've run it successfully and did: >> >> git merge -X subtree=Modules/ThirdParty/GDCM/src/gdcm upstream-gdcm >> >> as it instructs. This leaves one file conflicted: >> >> Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt >> >> Due to the change in git SHA 70306386. > >It should probably still be kept. If it is still relevant to >upstream, it could be submitted.
Sorry, what I mean is: what must I do git-wise? Do I just manually fix the conflict in the same commit as my gdcm update, or do I need to make it a separate commit to indicate it's not part of gdcm proper, or...? Cheers, -- ____________________________________________________________ Sean McBride, B. Eng [email protected] Rogue Research www.rogue-research.com Mac Software Developer Montréal, Québec, Canada _______________________________________________ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Kitware offers ITK Training Courses, for more information visit: http://kitware.com/products/protraining.php Please keep messages on-topic and check the ITK FAQ at: http://www.itk.org/Wiki/ITK_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/insight-developers
