Deploying with Git. Simple and Effective
forwardmx.io
forwardmx.io
In the Java world is common to use tools like Jenkins for your continuous delivery pipeline. You can have a Jenkins job triggered by a Pull Request, so you can validate the build passes and perform code reviews. Then you can have another hook for merging the PR which can perform additional integration tests, stress tests etc and deploy to artifactory (or other), and if everything passes you can finally deploy to production.
I dont see the conflict honestly :)