[Libwebsockets] merge conflicts in CMakeLists.txt

Per Bothner per at bothner.com
Wed Mar 1 03:43:19 CET 2017


It's happened multiple times that I've gotten a merge
conflict in CMakeLists.txt when doing a 'git pull'.
And it just happened again. What is going on?
Is some part of the build modifying that file?

$ git pull
remote: Counting objects: 28, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 28 (delta 24), reused 28 (delta 24), pack-reused 0
Unpacking objects: 100% (28/28), done.
 From https://github.com/warmcat/libwebsockets
  + 5a45960...1906b5d master     -> origin/master  (forced update)
Auto-merging lib/lws-plat-win.c
Auto-merging lib/libwebsockets.h
Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.
[bothner at localhost libwebsockets]2603$ less CMakeLists.txt

diff --cc CMakeLists.txt
index 3e85448,95f473e..0000000
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1340,9 -1340,10 +1340,16 @@@ if (NOT LWS_WITHOUT_TESTAPPS
                               "plugins/protocol_post_demo.c" "" "")
                 create_plugin(protocol_lws_table_dirlisting
                               "plugins/generic-table/protocol_table_dirlisting.c" "" "")
++<<<<<<< HEAD
  +              create_plugin(protocol_lws_raw_test
  +                            "plugins/protocol_lws_raw_test.c" "" "")
  +
++=======
+               if (NOT WIN32)
+                             create_plugin(protocol_lws_raw_test
+                             "plugins/protocol_lws_raw_test.c" "" "")
+               endif()
++>>>>>>> 1906b5d1d07bd22a065a7d7714f9f0e251a36315
   
   if (LWS_WITH_SERVER_STATUS)
                 create_plugin(protocol_lws_server_status

-- 
	--Per Bothner
per at bothner.com   http://per.bothner.com/


More information about the Libwebsockets mailing list