How to deal with advanced conflicting branches on jenkins

Question

The idea is this:

• all developers work on their functional branches and push them on github
• jenkins starts the build (initiated by clicking on github) on the test job to run unit tests in these function branches.
• After passing the test, the manager goes to github to check the code.
• If the code check is in order, then this assembly is advanced (to promote the assembly plugin) manually in order to “pass QA, Ready for prod”, in the “actions” section we set up “trigger / call assemblies for other projects” to trigger a separate test- task prod is only for combining this branch of functions for managing a remote repo.

job test to promote assembly configuration:

job test-prod SCM configuration:

So, 2 questions:

• in step 4, we have situations similar to two conflicting function branches that passed the code check, the first branch that is being promoted will be fine, but the second will have conflicts and fail, is there any way to detect the conflict before? I know that "merging before assembly" can avoid conflict, but this requires that the old branch has already been merged with the remote master.

• in cases without conflicts, whenever the second task is launched with manual promotion, there is always an additional assembly called: "Legacy code started this work. There is no information about the reason," I have no idea how this happens.

In addition, I do not know if the idea is correct regarding the entire conveyor, any suggestions are welcome!

Answer 1

Disclaimer: I don't know anything about git.

According to this , it is best to use rebase . Since I am not familiar with git, I cannot tell you how to configure rebase on Jenkins.

There is another poster here that also has problems with git and "Legacy code started this job", launching additional builds: Legacy code started this work. Information about the reason is not available .