[Libwebsockets] merge conflicts in CMakeLists.txt

Andy Green andy at warmcat.com
Wed Mar 1 03:53:19 CET 2017



On March 1, 2017 11:43:19 AM GMT+09:00, Per Bothner <per at bothner.com> wrote:
>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?

I don't keep a history on master, at least if the patch I'm changing is less than only a few days old.

That's why there are few "add x" "fix x" "fix x 2" etc type mess, I go back and fix "add x".

The correct git flow to consume that is, eg,

 $ git fetch https://github.com/warmcat/libwebsockets +master:m
 $ git reset --hard m

If you have patches on top use git stash or stgit to reapply them on the new tree.

The other branches have a static history, just no point on master.

-Andy


>$ 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



More information about the Libwebsockets mailing list