I uploaded the project on github and I'm trying to fix the conflicts.

I tried to add to the gitignore file this, but it doesn't seem to help: *.class *.java.hsp *.sonarj *.sw* .DS_Store .settings .springBeans bin build.sh integration-repo ivy-cache jxl.log jmx.log derby.log spring-test/test-output/ .gradle argfile* pom.xml activemq-data/

classes/ /build buildSrc/build /spring-*/build /src/asciidoc/build target/

# Eclipse artifacts, including WTP generated manifests .classpath .project spring-*/src/main/java/META-INF/MANIFEST.MF

# IDEA artifacts and output dirs *.iml *.ipr *.iws .idea out test-output atlassian-ide-plugin.xml .gradletasknamecache

How can I fix this?

This branch has not been deployed No deployments Review required At least 1 approving review is required by reviewers with write access. Learn more. This branch has conflicts that must be resolved Use the command line to resolve conflicts before continuing Resolve conflicts Conflicting files .idea/workspace.xml target/classes/project/controller/UserController.class target/classes/project/persistence/entities/Event.class target/classes/project/persistence/entities/User.class target/classes/project/persistence/repositories/UserRepository.class target/classes/project/service/Implementation/UserServiceImplementation.class target/classes/project/service/UserService.class Merge pull request You can also open this in GitHub Desktop or view command line instructions