Merging of 1) feature/docker_and_security [branch] & 2) neo4j [branch]

[phalberg]

Seemless branch merging off 1 & 2 needs to be made soon.

[phalberg]

We will create a new branch that will capture the 1 and 2 branches, together, which should be our resulting application.

[phalberg]

Result first attempt merging.
CONFLICT (content): Merge conflict in .gitignore
Auto-merging code/build.gradle.kts
Auto-merging code/src/main/java/com/example/experiment1/Experiment1Application.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/Experiment1Application.java
CONFLICT (modify/delete): code/src/main/java/com/example/experiment1/RedisDataLoader.java deleted in a1b77ca and modified in HEAD. Version HEAD of code/src/main/java/com/example/experiment1/RedisDataLoader.java left in tree.
Auto-merging code/src/main/java/com/example/experiment1/controller/PollController.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/controller/PollController.java
Auto-merging code/src/main/java/com/example/experiment1/controller/UserController.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/controller/UserController.java
Auto-merging code/src/main/java/com/example/experiment1/controller/VoteController.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/controller/VoteController.java
CONFLICT (modify/delete): code/src/main/java/com/example/experiment1/service/Neo4jPollService.java deleted in a1b77ca and modified in HEAD. Version HEAD of code/src/main/java/com/example/experiment1/service/Neo4jPollService.java left in tree.
Auto-merging code/src/main/java/com/example/experiment1/service/PollManager.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/service/PollManager.java
Auto-merging code/src/main/java/com/example/experiment1/service/RabbitMQPollService.java
CONFLICT (content): Merge conflict in code/src/main/java/com/example/experiment1/service/RabbitMQPollService.java
CONFLICT (modify/delete): code/src/main/java/com/example/experiment1/service/RedisPollService.java deleted in a1b77ca and modified in HEAD. Version HEAD of code/src/main/java/com/example/experiment1/service/RedisPollService.java left in tree.
Auto-merging code/src/main/resources/application.properties
CONFLICT (content): Merge conflict in code/src/main/resources/application.properties
Auto-merging code/src/test/java/com/example/experiment1/PollAppScenarioIntegrationTest.java
CONFLICT (content): Merge conflict in code/src/test/java/com/example/experiment1/PollAppScenarioIntegrationTest.java
CONFLICT (modify/delete): code/testdb.mv.db deleted in a1b77ca and modified in HEAD. Version HEAD of code/testdb.mv.db left in tree.
Automatic merge failed; fix conflicts and then commit the result.

STATUS.
Unmerged paths:
(use "git add/rm ..." as appropriate to mark resolution)
both modified: .gitignore
both modified: code/src/main/java/com/example/experiment1/Experiment1Application.java
deleted by them: code/src/main/java/com/example/experiment1/RedisDataLoader.java
both modified: code/src/main/java/com/example/experiment1/controller/PollController.java
both modified: code/src/main/java/com/example/experiment1/controller/UserController.java
both modified: code/src/main/java/com/example/experiment1/controller/VoteController.java
deleted by them: code/src/main/java/com/example/experiment1/service/Neo4jPollService.java
both modified: code/src/main/java/com/example/experiment1/service/PollManager.java
both modified: code/src/main/java/com/example/experiment1/service/RabbitMQPollService.java
deleted by them: code/src/main/java/com/example/experiment1/service/RedisPollService.java
both modified: code/src/main/resources/application.properties
both modified: code/src/test/java/com/example/experiment1/PollAppScenarioIntegrationTest.java
deleted by them: code/testdb.mv.db

[phalberg]

Finished merging, some things need to be adjusted for soon and changed, should also be under UIT now