Closed tacketar closed 8 years ago
This PR doesn't merge against master, @tacketar
hudson.plugins.git.GitException: Command "git merge 0458da62853f97893c51ab10e338be91e4e76239" returned status code 1:
stdout: Auto-merging src/toolbox/tbx/network.h
Auto-merging src/toolbox/tbx/list.h
CONFLICT (content): Merge conflict in src/toolbox/tbx/list.h
Auto-merging src/lio/lio_fuse_core.c
CONFLICT (content): Merge conflict in src/lio/lio_fuse_core.c
Auto-merging src/lio/lio_core_io.c
CONFLICT (content): Merge conflict in src/lio/lio_core_io.c
Auto-merging src/lio/lio_config.c
Auto-merging src/lio/lio/lio.h
CONFLICT (content): Merge conflict in src/lio/lio/lio.h
Auto-merging src/lio/lio.h
CONFLICT (content): Merge conflict in src/lio/lio.h
Auto-merging README.md
Auto-merging CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.
This is massive and unwieldy pull request. Getting this merged in should get us back to making more manageable pull requests. This has a litany of changes: