06:56:24,720 INFO - Checking step execute condition... 06:56:24,721 INFO - Step execute condition satisfied, executing... 06:56:25,669 INFO - Executing pre-execute action... 06:56:25,669 INFO - Running step... 06:56:25,670 INFO - Checking out revision '5783858953b2b1284f864475ed82b90a7d3738d5' of repository 'Git-Sherlock'... 06:56:25,672 DEBUG - Executing command: git checkout -f 5783858953b2b1284f864475ed82b90a7d3738d5 06:56:25,672 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:25,756 INFO - HEAD is now at 57838589 SP-1809 Boolean UI 06:56:25,761 DEBUG - Executing command: git submodule update --init --recursive 06:56:25,761 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:28,687 INFO - Getting changes of 'Git-Sherlock' since build '3.0.0.2371'... 06:56:28,690 DEBUG - Executing command: git log -1 --date=raw --pretty=format:%cd 5783858953b2b1284f864475ed82b90a7d3738d5 06:56:28,690 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:28,744 DEBUG - 1540807125 +0530 06:56:28,745 DEBUG - Executing command: git log -1 --date=raw --pretty=format:%cd 5783858953b2b1284f864475ed82b90a7d3738d5 06:56:28,745 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:28,777 DEBUG - 1540807125 +0530 06:56:28,778 DEBUG - Executing command: git config --replace-all core.quotepath false 06:56:28,778 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:28,810 DEBUG - Executing command: git log --name-status --pretty=raw 5783858953b2b1284f864475ed82b90a7d3738d5..5783858953b2b1284f864475ed82b90a7d3738d5 06:56:28,810 DEBUG - Command working directory: D:\Sherlock\3d-sprint\proof 06:56:09,705 INFO - Getting local change... 06:56:09,706 INFO - Checking working head... 06:56:09,706 DEBUG - Executing command: git rev-parse HEAD 06:56:09,706 DEBUG - Command working directory: D:\git_repo\3d-sprint 06:56:09,798 DEBUG - Executing command: git config core.quotepath false 06:56:09,798 DEBUG - Command working directory: D:\git_repo\3d-sprint 06:56:09,875 INFO - Checking if there are uncommitted files... 06:56:09,875 DEBUG - Executing command: git status 06:56:09,875 DEBUG - Command working directory: D:\git_repo\3d-sprint 06:56:10,117 INFO - On branch release/sdk-1.3 06:56:10,118 INFO - Your branch and 'origin/release/sdk-1.3' have diverged, 06:56:10,118 INFO - and have 2 and 2 different commits each, respectively. 06:56:10,118 INFO - (use "git pull" to merge the remote branch into yours) 06:56:10,118 INFO - 06:56:10,118 INFO - Changes not staged for commit: 06:56:10,118 INFO - (use "git add ..." to update what will be committed) 06:56:10,118 INFO - (use "git checkout -- ..." to discard changes in working directory) 06:56:10,118 INFO - 06:56:10,118 INFO - modified: common/database (new commits) 06:56:10,118 INFO - modified: common/samples (new commits) 06:56:10,118 INFO - 06:56:10,118 INFO - no changes added to commit (use "git add" and/or "git commit -a") 06:56:10,123 INFO - Fetching remote change sets... 06:56:10,123 DEBUG - Executing command: git fetch origin develop 06:56:10,123 DEBUG - Command working directory: D:\git_repo\3d-sprint 06:56:14,172 INFO - From 3dgit.3dsystems.com:3DSprint/3d-sprint 06:56:14,172 INFO - * branch develop -> FETCH_HEAD 06:56:14,211 INFO - Merging with FETCH_HEAD... 06:56:14,211 DEBUG - Executing command: git merge FETCH_HEAD 06:56:14,211 DEBUG - Command working directory: D:\git_repo\3d-sprint 06:56:22,793 INFO - Removing public/include/print/printcore/tray/isupportgeneratable.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/islstray.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/islatray.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/ipixelslatray.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/imjptray.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/imicroslatray.h 06:56:22,793 INFO - Removing public/include/print/printcore/tray/icagegeneratable.h 06:56:22,793 INFO - Removing public/include/print/printcore/printer/iprojet1200.h 06:56:22,793 INFO - Removing public/include/print/printcore/printer/imicroslaprinter.h 06:56:22,793 INFO - Auto-merging public/include/print/printcore/printcore.h 06:56:22,793 INFO - Auto-merging public/include/print/printcore/printbasedefine.h 06:56:22,793 INFO - Auto-merging public/include/print/printcore/data/itrayinfo.h 06:56:22,793 INFO - CONFLICT (content): Merge conflict in public/include/print/printcore/data/itrayinfo.h 06:56:22,793 INFO - Removing public/include/print/printcore/data/islstraystyle.h 06:56:22,793 INFO - Removing public/include/print/printcore/data/islatraystyle.h 06:56:22,793 INFO - Removing public/include/print/printcore/data/ipixelslatraystyle.h 06:56:22,793 INFO - Removing public/include/print/printcore/data/imjptraystyle.h 06:56:22,793 INFO - Removing public/include/print/printcore/data/imicroslatraystyle.h 06:56:22,793 INFO - Removing public/include/print/printcore/available/imjptrayavailable.h 06:56:22,793 INFO - Auto-merging public/include/print/printcore/available/icompensatable.h 06:56:22,793 INFO - Auto-merging public/include/print/printcore/available/ibuildpacketassignable.h 06:56:22,793 INFO - CONFLICT (content): Merge conflict in public/include/print/printcore/available/ibuildpacketassignable.h 06:56:22,793 INFO - Removing public/include/graphics/widget/widgetbase.h 06:56:22,793 INFO - Removing public/include/graphics/widget/visualadaptermanager.h 06:56:22,793 INFO - Removing public/include/graphics/widget/trackballwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/textshape.h 06:56:22,793 INFO - Removing public/include/graphics/widget/supportwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/sliceshape.h 06:56:22,793 INFO - Removing public/include/graphics/widget/selectableshape.h 06:56:22,793 INFO - Removing public/include/graphics/widget/resourcecounter.h 06:56:22,793 INFO - Removing public/include/graphics/widget/outlineshape.h 06:56:22,793 INFO - Removing public/include/graphics/widget/orientwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/movewidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/meshshape.h 06:56:22,793 INFO - Removing public/include/graphics/widget/materialassignwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/interface/iwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/exportvisibility.h 06:56:22,793 INFO - Removing public/include/graphics/widget/diskwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/cylinderwidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/clipplanewidget.h 06:56:22,793 INFO - Removing public/include/graphics/widget/canvaswindow.h 06:56:22,793 INFO - Removing public/include/graphics/widget/canvassceneattribute.h 06:56:22,793 INFO - Removing public/include/graphics/widget/canvas_tool.h 06:56:22,793 INFO - Removing public/include/graphics/widget/brushwidget.h 06:56:22,794 INFO - Removing public/include/graphics/widget/billboardshape.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/wireframevisualobject.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/visualobjectbase.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/trianglemeshvisualobject.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/slicevisualobject.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/quadmeshvisualobject.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/visualobject/ivisualobject.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/scene/irenderlayer.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/scene/irenderable.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/iwireframeshader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/isurfacesplattingshader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/isilhouetteshader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/ishader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/ipointcloudshader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/ipixelmapshader.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/imaterialset.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/imaterialownable.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/imaterial.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/material/ifont.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/selectablenodevisitor.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/renderablenodevisitor.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/nodevisitor.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/itransformnode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/iscenenode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/iparentnode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/inode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/igeometrynode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/graph/ichildnode.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/exportvisibility.h 06:56:22,794 INFO - Removing public/include/graphics/canvas/basic/icanvasobject.h 06:56:22,794 INFO - Removing public/include/framework/interaction/ithreedcanvasproxy.h 06:56:22,794 INFO - Removing public/include/framework/interaction/icamerahandler.h 06:56:22,794 INFO - Auto-merging public/include/foundation/core/interface/ipointerarray.h 06:56:22,794 INFO - Auto-merging public/include/foundation/core/interface/iinputarchive.h 06:56:22,794 INFO - CONFLICT (content): Merge conflict in public/include/foundation/core/interface/iinputarchive.h 06:56:22,794 INFO - Auto-merging public/include/foundation/core/exception/ioexception.h 06:56:22,794 INFO - Auto-merging private/sprint/source/libprint-full/libprint-full.jpkg 06:56:22,794 INFO - Auto-merging private/sprint/source/libprint-basic/libprint-basic.jpkg 06:56:22,794 INFO - Auto-merging private/sprint/source/kernel/libkernel/libkernel-full.jpkg 06:56:22,794 INFO - Auto-merging private/sprint/source/kernel/libkernel/libkernel-basic.jpkg 06:56:22,794 INFO - Removing private/printinterop/source/test/test_printscript/Services/LogUtils.cs 06:56:22,794 INFO - Auto-merging private/printinterop/source/printwpfui/Utils/FileFilterUtil.cs 06:56:22,794 INFO - CONFLICT (content): Merge conflict in private/printinterop/source/printwpfui/Utils/FileFilterUtil.cs 06:56:22,794 INFO - Removing private/printinterop/source/printwpfui/Resources/Icons.xaml 06:56:22,794 INFO - Removing private/printinterop/source/printwpfui/Controls/Controls/ToolControl.cs 06:56:22,794 INFO - Auto-merging private/printframework/source/printinteraction/tool/traysetuptool.cpp 06:56:22,794 INFO - CONFLICT (content): Merge conflict in private/printframework/source/printinteraction/tool/traysetuptool.cpp 06:56:22,794 INFO - Removing private/printframework/include/printinteraction/printcamerahandler.h 06:56:22,794 INFO - Auto-merging private/print/test/test_printcore/test_tray_ext.cpp 06:56:22,794 INFO - Removing private/print/test/test_printcore/test_projet1200tray.cpp 06:56:22,794 INFO - Auto-merging private/print/source/trayplugins/trayfunction/buildfilegenerator/projet3600buildfilegeneratorimpl.cpp 06:56:22,794 INFO - CONFLICT (content): Merge conflict in private/print/source/trayplugins/trayfunction/buildfilegenerator/projet3600buildfilegeneratorimpl.cpp 06:56:22,794 INFO - CONFLICT (modify/delete): private/print/source/trayplugins/projet5500/projet5500tray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/trayplugins/projet5500/projet5500tray.cpp left in tree. 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet3600/projet3600tray.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet35xx/projet35xxtray.h 06:56:22,794 INFO - CONFLICT (modify/delete): private/print/source/trayplugins/projet35xx/projet35xxtray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/trayplugins/projet35xx/projet35xxtray.cpp left in tree. 06:56:22,794 INFO - CONFLICT (modify/delete): private/print/source/trayplugins/projet2500/projet2500tray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/trayplugins/projet2500/projet2500tray.cpp left in tree. 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslasupportgenerator.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslaslicer.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/zsliceslicer.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/verifyctl.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/verifyctl.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/triangulate.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/tri.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/stdafx.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/shell.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/segtriset.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/segtriset.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/segmenttri.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/mybase.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/monotone.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/misc.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/lifted_funcs.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/interface.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/ctlslicer.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/ctlslicer.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/construct.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/StdAfx.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/verify/3dverify.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/myhash.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Vertex.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Vertex.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/TriangleSampler.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/TriangleSampler.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Triangle.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Triangle.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Threedsb.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Surfels2PixelsIterator.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Surfels2PixelsIterator.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Surfels.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Surfels.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfels2PixelsIterator.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfels2PixelsIterator.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfels.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfels.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfelConstructor.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportSurfelConstructor.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportPixels.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportPixels.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportDLLApi.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportDLLApi.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportDLL.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/SupportDLL.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Solve.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Solve.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Segment.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Segment.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Resource.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Polyvertex.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Polyvertex.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Polyinterface.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Polyinterface.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Point2D.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Point2D.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Pixels.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Pixels.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/PixelBlending.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/PartSurfelConstructor.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/PartSurfelConstructor.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LoopGenerator.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LoopGenerator.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LineSegmentSampler.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LineSegmentSampler.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LineSegment.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/LineSegment.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeomOP3D.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeomOP3D.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeomOP2D.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeomOP2D.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeoTransform.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/GeoTransform.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/EdgeLoop.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/EdgeLoop.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/CutStl.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/CutStl.cpp 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/CtlSplitter.h 06:56:22,794 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/CtlSplitter.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/CommonDefine.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Calcutil.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Calcutil.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/BuildStyleConverter.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/BuildStyleConverter.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/BoundingBox.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/BoundingBox.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Array3D.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Array3D.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Array2D.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/supportdll/Array2D.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/path_sep.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/globalDefs.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/dllmain.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/baseobject.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/ProgressInfo.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/ProgressInfo.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/Logger.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/Logger.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/LoggedProcess.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/LoggedProcess.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/GlRgbTriple.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/ErrorCodes.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/Environment.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/Environment.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/Constants.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/msdlibrary/BaseObject.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/slcdll.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/Transaction.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/ModelMatrix.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/ModelMatrix.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/ModelManage.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/ModelManage.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/JobInfo.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/JobInfo.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/CTLModel.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/CTLMODEL.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/modelmanage/CList2.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/landersupportparam.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/landersupportparam.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/landerlib/LanderSliceSupporterAPI.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/landerlib/LanderSliceSupporterAPI.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/ImgParam.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/ImgParam.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/ImageGen.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/ImageGen.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/BuildFile.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/imagegen/BuildFile.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderutility.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderutility.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderutil.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderutil.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderdefine.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplanderdefine.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplandercontext.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/gplandercontext.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/vec2d.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/triangulate_plist.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/triangle_intersect.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/split_plist.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/sort.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/sort.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/slicer.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/slicer.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/slc_file.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/slc_file.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/simp_def.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/rle.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/rle.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/polyalgs.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/polyalgs.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/poly2f.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/pb.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/pb.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/osdep.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/mypair.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/myhash2.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/litelist.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/litelist.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/layerrle.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/layerrle.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/hash.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/hash.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/grid_ind.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/grid_ind.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/gpc.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/gpc.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/gen_util.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/gen_util.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/dynarray.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/ctlsplit.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/ctl2rle_err.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/ctl.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/ctl.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/component.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/component.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/byte_pac.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/byte_pac.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/booleanisor.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/booleanisor.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/bool2.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/bool2.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/blockallocator.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/bagtr.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/bagtr.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/StlViewer.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/StlViewer.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslalib/ctl_library/Ctl_Library.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/uslabuildtimeestimator.cpp 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/projet1200tray.h 06:56:22,795 INFO - Removing private/print/source/trayplugins/projet1200/projet1200tray.cpp 06:56:22,795 INFO - Auto-merging private/print/source/trayplugins/instantiation.cpp 06:56:22,795 INFO - CONFLICT (content): Merge conflict in private/print/source/trayplugins/instantiation.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printdb/data/slsstyle.cpp 06:56:22,795 INFO - CONFLICT (content): Merge conflict in private/print/source/printdb/data/slsstyle.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printcore/utility.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printcore/tray.cpp 06:56:22,795 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/tray.cpp 06:56:22,795 INFO - CONFLICT (modify/delete): private/print/source/printcore/slstray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/printcore/slstray.cpp left in tree. 06:56:22,795 INFO - Auto-merging private/print/source/printcore/sls/bpf/bpfexporter.cpp 06:56:22,795 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/sls/bpf/bpfexporter.cpp 06:56:22,795 INFO - Removing private/print/source/printcore/slatray.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printcore/sla/generatepxl.cpp 06:56:22,795 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/sla/generatepxl.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printcore/printreference.cpp 06:56:22,795 INFO - Removing private/print/source/printcore/printer/iprojet1200.cpp 06:56:22,795 INFO - CONFLICT (modify/delete): private/print/source/printcore/pixelslatray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/printcore/pixelslatray.cpp left in tree. 06:56:22,795 INFO - Auto-merging private/print/source/printcore/part/mjpmodelpart.cpp 06:56:22,795 INFO - Removing private/print/source/printcore/modifier/remapmaterial.h 06:56:22,795 INFO - Removing private/print/source/printcore/modifier/remapmaterial.cpp 06:56:22,795 INFO - Auto-merging private/print/source/printcore/modifier/gatesupportgenerator.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/modifier/empiresupportgenerator.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/modifier/empiresupportgenerator.cpp 06:56:22,796 INFO - CONFLICT (modify/delete): private/print/source/printcore/mjptray.cpp deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/source/printcore/mjptray.cpp left in tree. 06:56:22,796 INFO - Removing private/print/source/printcore/microslatray.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/job.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/instantiation.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/instantiation.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/info/trayinfo.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/info/trayinfo.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/compensator/scalecompensator.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/compensator/scalecompensator.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/compensator/polynomialscalecompensator.cpp 06:56:22,796 INFO - Removing private/print/source/printcore/buildstyle/microslabuildstyle.cpp 06:56:22,796 INFO - Removing private/print/source/printcore/availables/mjptrayavailable.cpp 06:56:22,796 INFO - Removing private/print/source/printcore/availables/lvmavailable.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/availables/compensatable.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/availables/compensatable.cpp 06:56:22,796 INFO - Removing private/print/source/printcore/availables/cagegeneratable.cpp 06:56:22,796 INFO - Auto-merging private/print/source/printcore/availables/buildpacketassignable.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/printcore/availables/buildpacketassignable.cpp 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/projetclientdriver.h 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/projetclientdriver.cpp 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/printer/projetclientprinter.h 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/printer/projetclientprinter.cpp 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/printer/projet5500.h 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/printer/projet5500.cpp 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/instantiation.cpp 06:56:22,796 INFO - Removing private/print/source/modules/projetclientmodule/construction.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/figure4restapi/figure4standalone.h 06:56:22,796 INFO - Auto-merging private/print/source/modules/figure4restapi/figure4standalone.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/figure4restapi/figure4driver.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/modules/figure4restapi/figure4driver.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/conmanmodule/printer/proxsls6100.cpp 06:56:22,796 INFO - Removing private/print/source/modules/conmanmodule/printer/projet1200.h 06:56:22,796 INFO - Removing private/print/source/modules/conmanmodule/printer/projet1200.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/conmanmodule/printer/microslaprinter.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/conmanmodule/printer/figure4.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/modules/conmanmodule/printer/figure4.h 06:56:22,796 INFO - Auto-merging private/print/source/modules/conmanmodule/printer/figure4.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/source/modules/conmanmodule/printer/figure4.cpp 06:56:22,796 INFO - Auto-merging private/print/source/modules/conmanmodule/conmandriver.cpp 06:56:22,796 INFO - Removing private/print/include/trayplugins/projet5500tray.h 06:56:22,796 INFO - Removing private/print/include/trayplugins/projet2500tray.h 06:56:22,796 INFO - Removing private/print/include/projetclientmodule/projetclienterror.h 06:56:22,796 INFO - Removing private/print/include/projetclientmodule/instantiation.h 06:56:22,796 INFO - Removing private/print/include/projetclientmodule/exportvisibility.h 06:56:22,796 INFO - Auto-merging private/print/include/printdb/data/slsstyle.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/utility.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/tray.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/include/printcore/tray.h 06:56:22,796 INFO - CONFLICT (modify/delete): private/print/include/printcore/slstray.h deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/include/printcore/slstray.h left in tree. 06:56:22,796 INFO - Removing private/print/include/printcore/slatray.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/sla/generatepxl.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/include/printcore/sla/generatepxl.h 06:56:22,796 INFO - CONFLICT (modify/delete): private/print/include/printcore/pixelslatray.h deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/include/printcore/pixelslatray.h left in tree. 06:56:22,796 INFO - Removing private/print/include/printcore/modifier/iremapmaterial.h 06:56:22,796 INFO - CONFLICT (modify/delete): private/print/include/printcore/mjptray.h deleted in 5783858953b2b1284f864475ed82b90a7d3738d5 and modified in HEAD. Version HEAD of private/print/include/printcore/mjptray.h left in tree. 06:56:22,796 INFO - Removing private/print/include/printcore/microslatray.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/info/trayinfo.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/include/printcore/info/trayinfo.h 06:56:22,796 INFO - Removing private/print/include/printcore/buildstyle/microslabuildstyle.h 06:56:22,796 INFO - Removing private/print/include/printcore/availables/supportgeneratable.h 06:56:22,796 INFO - Removing private/print/include/printcore/availables/lvmavailable.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/availables/compensatable.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/include/printcore/availables/compensatable.h 06:56:22,796 INFO - Removing private/print/include/printcore/availables/cagegeneratable.h 06:56:22,796 INFO - Auto-merging private/print/include/printcore/availables/buildpacketassignable.h 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/print/include/printcore/availables/buildpacketassignable.h 06:56:22,796 INFO - Removing private/print/include/printalgorithm/projet1200/uslasupportgenerator.h 06:56:22,796 INFO - Removing private/print/include/printalgorithm/projet1200/uslaslicer.h 06:56:22,796 INFO - Removing private/print/include/printalgorithm/projet1200/uslabuildtimeestimator.h 06:56:22,796 INFO - Auto-merging private/modifier/source/geoapiv3/geomeshcollider.cpp 06:56:22,796 INFO - CONFLICT (content): Merge conflict in private/modifier/source/geoapiv3/geomeshcollider.cpp 06:56:22,796 INFO - Auto-merging private/modifier/source/geoapiv3/geogatesupportgenerator.cpp 06:56:22,796 INFO - Removing private/graphics/source/widget/shape/textshape.cpp 06:56:22,796 INFO - Removing private/graphics/source/widget/canvaswindow.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/renderer.jpkg 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/state/blending.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/uniformblockmatrixarraymember.h 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/uniformblockarraymember.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/uniformblock.h 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/shaderprogramreference.h 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/shaderprogramreference.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/viewprojectionmatrixuniform.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/viewmatrixuniform.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/projectionmatrixuniform.cpp 06:56:22,796 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/modelviewprojectionmatrixuniform.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/modelviewmatrixuniform.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/shader/drawautomaticuniform/modelmatrixuniform.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/platform/platform.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/device/devicefactory.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/cleanable/cleanableobserver.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/neutral/cleanable/cleanable.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/texture/glxtexture2d.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/shader/glxshaderprogram.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/framebuffer/glxframebuffer.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/device/glxdevice.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/device/glxdevice.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/device/gl4device.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/device/gl3device.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/context/gl4rendercontext.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/glx/context/gl3rendercontext.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/texture/gl2texture2d.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/shader/gl2shaderprogram.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/framebuffer/gl2framebuffer.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/device/gl2device.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/device/gl2device.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl2/context/gl2rendercontext.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/vertexarray/glvertexarray.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/texture/gltextureunits.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/texture/gltextureunits.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/texture/gltexture2d.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/shader/gluniformint.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/shader/glshaderprogram.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/framebuffer/glframebuffer.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/device/gldevice.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/context/glrendercontext.h 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/buffer/glvertexbuffer.cpp 06:56:22,797 INFO - Removing private/graphics/source/renderer/gl/buffer/gluniformbuffer.cpp 06:56:22,797 INFO - Removing private/graphics/source/canvas/selection/selector.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/renderoptions.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/renderlayer.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/renderbuffer.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/renderblock.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/iwindow.cpp 06:56:22,797 INFO - Removing private/graphics/source/canvas/scene/irenderlayer.cpp 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/wireframeshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/usershader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/surfacesplattingshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/solidshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/silhouetteshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/selectionshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/pointcloudshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/pixelmapshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/phongshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/normalshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/materialset.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/material.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/latticeshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/ishader.cpp 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/highlightshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/fontcache.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/font.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/flatshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/depthshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/billboardshader.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/material/appearance.h 06:56:22,797 INFO - Removing private/graphics/source/canvas/instantiation.cpp 06:56:22,797 INFO - Removing private/graphics/source/canvas/graph/igeometrynode.cpp 06:56:22,797 INFO - Removing private/graphics/include/widget/instantiation.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/vertexarray/ivertexarray.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/texture/itextureunits.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/texture/itextureunit.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/texture/itexture2d.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/state/drawstate.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/state/blending.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/shader/iuniformblockmember.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/shader/iuniformblock.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/shader/ishadervertexattribute.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/shader/ishaderprogram.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/object/trackobject.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/instantiation.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/framebuffer/iframebufferattachment.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/framebuffer/iframebuffer.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/framebuffer/idepthstencilattachment.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/framebuffer/idepthattachment.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/framebuffer/icolorattachment.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/exportvisibility.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/device/idevice.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/context/scopedrendercontext.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/context/irendercontext.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/context/icontextproperties.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/buffer/iwritepixelbuffer.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/buffer/ivertexbufferattribute.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/buffer/ivertexbuffer.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/buffer/iuniformbuffer.h 06:56:22,797 INFO - Removing private/graphics/include/renderer/buffer/ireadpixelbuffer.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/utility/converter.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/instantiation.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/instance/instance.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/graph/transformnode.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/graph/scenenode.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/graph/parentnode.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/graph/materialownable.h 06:56:22,797 INFO - Removing private/graphics/include/canvas/graph/childnode.h 06:56:22,797 INFO - Auto-merging private/framework/source/platform/settingmanager.cpp 06:56:22,797 INFO - CONFLICT (content): Merge conflict in private/framework/source/platform/settingmanager.cpp 06:56:22,797 INFO - Removing private/framework/source/interaction/threedcanvasproxy.cpp 06:56:22,797 INFO - Removing private/framework/source/interaction/interface/ithreedcanvasproxy.cpp 06:56:22,797 INFO - Removing private/framework/source/interaction/interface/icamerahandler.cpp 06:56:22,797 INFO - Removing private/framework/include/interaction/threedcanvasproxy.h 06:56:22,797 INFO - Removing private/framework/include/interaction/camerahandler.h 06:56:22,797 INFO - Auto-merging private/foundation/source/core/stream/inputarchive.cpp 06:56:22,797 INFO - CONFLICT (content): Merge conflict in private/foundation/source/core/stream/inputarchive.cpp 06:56:22,797 INFO - Auto-merging private/foundation/source/core/stream/iinputarchive.cpp 06:56:22,797 INFO - CONFLICT (content): Merge conflict in private/foundation/source/core/stream/iinputarchive.cpp 06:56:22,797 INFO - Auto-merging private/foundation/source/core/stream/bufferedreader.cpp 06:56:22,797 INFO - CONFLICT (content): Merge conflict in private/foundation/source/core/stream/bufferedreader.cpp 06:56:22,797 INFO - Auto-merging private/foundation/source/core/exception/systemexception/ioexception.cpp 06:56:22,797 INFO - Auto-merging private/foundation/source/adp/geomagicapi.cpp 06:56:22,797 INFO - Auto-merging private/foundation/include/core/stream/inputarchive.h 06:56:22,797 INFO - CONFLICT (content): Merge conflict in private/foundation/include/core/stream/inputarchive.h 06:56:22,797 INFO - Auto-merging private/foundation/include/core/stream/bufferedreader.h 06:56:22,798 INFO - Fast-forwarding submodule common/samples 06:56:22,798 INFO - Auto-merging common/samples 06:56:22,798 INFO - Fast-forwarding submodule common/database 06:56:22,798 INFO - Auto-merging common/database 06:56:22,798 INFO - Auto-merging build/scripts/pydb/mkstylecpp.py 06:56:22,798 INFO - Auto-merging build/dependencies/adp-print.jdep 06:56:22,798 INFO - CONFLICT (content): Merge conflict in build/dependencies/adp-print.jdep 06:56:22,798 INFO - Auto-merging build/dependencies/adp-polygonica.jdep 06:56:22,798 INFO - CONFLICT (content): Merge conflict in build/dependencies/adp-polygonica.jdep 06:56:22,798 INFO - Auto-merging build/dependencies/adp-design-x.jdep 06:56:22,798 INFO - CONFLICT (content): Merge conflict in build/dependencies/adp-design-x.jdep 06:56:22,798 INFO - CONFLICT (modify/delete): build/dependencies/adp-dentalprint.jdep deleted in HEAD and modified in 5783858953b2b1284f864475ed82b90a7d3738d5. Version 5783858953b2b1284f864475ed82b90a7d3738d5 of build/dependencies/adp-dentalprint.jdep left in tree. 06:56:22,798 INFO - Auto-merging build/dependencies/adp-core.jdep 06:56:22,798 INFO - CONFLICT (content): Merge conflict in build/dependencies/adp-core.jdep 06:56:22,798 INFO - Removing apps/alexandria/migrator/temporary_database.h 06:56:22,798 INFO - Removing apps/3dsprintsdk/pyworkshop/test_projet_1200.py 06:56:22,798 INFO - Removing apps/3dsprintsdk/csworkshop/test_projet_1200.cs 06:56:22,798 INFO - Auto-merging apps/3dsprintsdk/cppworkshop/test_sls.cpp 06:56:22,798 INFO - CONFLICT (content): Merge conflict in apps/3dsprintsdk/cppworkshop/test_sls.cpp 06:56:22,798 INFO - Removing apps/3dsprintsdk/cppworkshop/test_projet_1200.cpp 06:56:22,798 INFO - Auto-merging apps/3dsprintsdk/cppworkshop/sprintdef.h 06:56:22,798 INFO - CONFLICT (content): Merge conflict in apps/3dsprintsdk/cppworkshop/sprintdef.h 06:56:22,798 INFO - Auto-merging apps/3dsprintsdk/cppworkshop/create_tray.cpp 06:56:22,798 INFO - CONFLICT (content): Merge conflict in apps/3dsprintsdk/cppworkshop/create_tray.cpp 06:56:22,798 INFO - Auto-merging apps/3dsprintsdk/cppworkshop/activation_status.cpp 06:56:22,798 INFO - Auto-merging apps/3dsprintsdk/cppworkshop/activate_projet1200.cpp 06:56:22,798 INFO - Auto-merging apps/3dsprint/test/test_scripts/sptestrunner.py 06:56:22,952 INFO - Automatic merge failed; fix conflicts and then commit the result. 06:56:42,837 INFO - Executing post-execute action... 06:56:42,837 ERROR - Step 'master>Proof>3D Sprint>Clone a Repository Into Build Server' is failed: Merge conflicts found. Please fix conflicts and merge first, then run proof build again.