[vtk-developers] Gerrit conflicts

[Bill Lorensen]

Marcus,

Here is the situation:

1) I want to review your change: http://review.source.kitware.com/#change,129
2) I have an up-to-date version of VTK
3)
git branch UsefulScripts
git checkout UsefulScripts
Switched to branch 'UsefulScripts'
[VTK(UsefulScripts)] git pull http://review.source.kitware.com/p/ITK
refs/changes/55/155/1
>From http://review.source.kitware.com/p/ITK
 * branch            refs/changes/55/155/1 -> FETCH_HEAD
Auto-merging .gitattributes
CONFLICT (add/add): Merge conflict in .gitattributes
Auto-merging CMake/CTestCustom.ctest.in
CONFLICT (add/add): Merge conflict in CMake/CTestCustom.ctest.in
Auto-merging CMake/TestNO_ICC_IDYNAMIC_NEEDED.cmake
CONFLICT (add/add): Merge conflict in CMake/TestNO_ICC_IDYNAMIC_NEEDED.cmake
Auto-merging CMake/pre-commit
CONFLICT (add/add): Merge conflict in CMake/pre-commit
Auto-merging CMakeLists.txt
CONFLICT (add/add): Merge conflict in CMakeLists.txt
Auto-merging CTestConfig.cmake
CONFLICT (add/add): Merge conflict in CTestConfig.cmake
Auto-merging Copyright.txt
CONFLICT (add/add): Merge conflict in Copyright.txt
Auto-merging Examples/CMakeLists.txt
CONFLICT (add/add): Merge conflict in Examples/CMakeLists.txt
Auto-merging Examples/README.txt
CONFLICT (add/add): Merge conflict in Examples/README.txt
Auto-merging Examples/SearchScript.sh
CONFLICT (add/add): Merge conflict in Examples/SearchScript.sh
Auto-merging README.html
CONFLICT (add/add): Merge conflict in README.html
Auto-merging Utilities/CMakeLists.txt
CONFLICT (add/add): Merge conflict in Utilities/CMakeLists.txt
Auto-merging Utilities/DICOMParser/CMakeLists.txt
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/CMakeLists.txt
Auto-merging Utilities/DICOMParser/DICOMAppHelper.cxx
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMAppHelper.cxx
Auto-merging Utilities/DICOMParser/DICOMAppHelper.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMAppHelper.h
Auto-merging Utilities/DICOMParser/DICOMCMakeConfig.h.in
CONFLICT (add/add): Merge conflict in
Utilities/DICOMParser/DICOMCMakeConfig.h.in
Auto-merging Utilities/DICOMParser/DICOMCallback.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMCallback.h
Auto-merging Utilities/DICOMParser/DICOMConfig.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMConfig.h
Auto-merging Utilities/DICOMParser/DICOMFile.cxx
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMFile.cxx
Auto-merging Utilities/DICOMParser/DICOMFile.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMFile.h
Auto-merging Utilities/DICOMParser/DICOMParser.cxx
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMParser.cxx
Auto-merging Utilities/DICOMParser/DICOMParser.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMParser.h
Auto-merging Utilities/DICOMParser/DICOMParserMap.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMParserMap.h
Auto-merging Utilities/DICOMParser/DICOMTypes.h
CONFLICT (add/add): Merge conflict in Utilities/DICOMParser/DICOMTypes.h
Auto-merging Utilities/Doxygen/CMakeLists.txt
CONFLICT (add/add): Merge conflict in Utilities/Doxygen/CMakeLists.txt
Auto-merging Utilities/SetupForDevelopment.sh
CONFLICT (add/add): Merge conflict in Utilities/SetupForDevelopment.sh
Auto-merging Utilities/kwsys/kwsysDateStamp.cmake
CONFLICT (add/add): Merge conflict in Utilities/kwsys/kwsysDateStamp.cmake
Auto-merging Utilities/metaIOConfig.h
CONFLICT (add/add): Merge conflict in Utilities/metaIOConfig.h
Auto-merging Wrapping/CMakeLists.txt
CONFLICT (add/add): Merge conflict in Wrapping/CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.
[VTK(UsefulScripts)]