[ITK-users] [ITK-dev] [ANN] ITK 4.9 Release Candidate 3 is ready for testing!

[Matt McCormick]

On Thu, Jan 21, 2016 at 3:05 PM, Sean McBride <sean at rogue-research.com> wrote:
> 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...?

It can be included in the update commit.

Thanks,
Matt