(the_merge) Resolve conflicts in src/CMakeLists.txt [ci skip]#443
(the_merge) Resolve conflicts in src/CMakeLists.txt [ci skip]#443SlySven merged 1 commit intodevelopment_merge_30from
Conversation
| # Copyright (C) 2015-2016 by Stephen Lyons - slysven@virginmedia.com # | ||
| ======= | ||
| # Copyright (C) 2015 by Stephen Lyons - slysven@virginmedia.com # | ||
| >>>>>>> SlySven/release_30 |
There was a problem hiding this comment.
Just in case my Repo is being taken in vain, my release_30 branch is synced to the Mudlet/release_30 at this point, they are both on the same SHA1 here. So just because there is a change to merge, that does not mean I am responsible for it. Like the other change below, that is not my handiwork.
|
How is this going to proceed, the command to skip the CI process finally seems to have taken, but the absence of the CI seems to also allow merging without approval - or is that because it is you, Vadim, positing this PR? 😕 UPDATE: CI is pointless until we get all the merge conflict markers removed by selecting which bits to use. |
|
I believe this is because the target branch is not "protected". |
|
|
SlySven
left a comment
There was a problem hiding this comment.
Getting into the hang of how this will work.
No description provided.