JGitFlow and CI / CD

[Mark Bidewell]

I am looking into using JGitflow for our projects in Git.  However I have concerns on the automated merge of release branches back into develop due to the potential for conflicts in the merge from a release branch back into Develop if Develop is kept open for changes during a QA cycle.  What is the JGitflow behavior if one of these merges fails during a release finish?  Also How do you organize your releases to avoid conflicts when using CI/CD tools for releasing?

Thanks.

[David Chwalisz]

It fails. We have had issues where the release process is successful, deployed to nexus, but fails with changes in the release or hotfix conflicting with changes in  develop. We suspect our issues were related more to space/tab issues and reformatted code, but the potential exists. 

When it fails, you can fix the conflict and continue and it works, but that is NOT an automated step. I am more likely to perform releases manually to be able to unwind issues if there is a problem. Or I can perform it locally in "dry run" mode (no Nexus or Git push options) and if it works we can run the job. But then what is the point of the job? I have also finished releases from a console on the Jenkins slave where the job failed.