prepare (1/4):
finished
cmake (2/4):
-- The C compiler identification is Clang 6.0.0
-- The CXX compiler identification is Clang 6.0.0
-- Check for working C compiler: /usr/bin/clang
-- Check for working C compiler: /usr/bin/clang -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/bin/clang++
-- Check for working CXX compiler: /usr/bin/clang++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /out/build
finished
make (3/4):
Scanning dependencies of target lemondb
[ 6%] Building CXX object CMakeFiles/lemondb.dir/main.cpp.o
[ 6%] Building CXX object CMakeFiles/lemondb.dir/threads/thread.cpp.o
[ 10%] Building CXX object CMakeFiles/lemondb.dir/db/Database.cpp.o
[ 13%] Building CXX object CMakeFiles/lemondb.dir/db/Table.cpp.o
[ 17%] Building CXX object CMakeFiles/lemondb.dir/query/Query.cpp.o
[ 20%] Building CXX object CMakeFiles/lemondb.dir/query/QueryParser.cpp.o
[ 24%] Building CXX object CMakeFiles/lemondb.dir/query/QueryResult.cpp.o
[ 27%] Building CXX object CMakeFiles/lemondb.dir/query/QueryBuilders.cpp.o
[ 31%] Building CXX object CMakeFiles/lemondb.dir/query/management/LoadTableQuery.cpp.o
In file included from /in/query/QueryBuilders.cpp:19:
/in/query/data/SelectQuery.h:9:1: error: version control conflict marker in file
<<<<<<< HEAD
^
[ 34%] Building CXX object CMakeFiles/lemondb.dir/query/management/DropTableQuery.cpp.o
1 error generated.
CMakeFiles/lemondb.dir/build.make:230: recipe for target 'CMakeFiles/lemondb.dir/query/QueryBuilders.cpp.o' failed
make[2]: *** [CMakeFiles/lemondb.dir/query/QueryBuilders.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
CMakeFiles/Makefile2:67: recipe for target 'CMakeFiles/lemondb.dir/all' failed
make[1]: *** [CMakeFiles/lemondb.dir/all] Error 2
Makefile:83: recipe for target 'all' failed
make: *** [all] Error 2
build failed