You might just be having a workflow branching problem, the gitflow discussion might help Git - branching strategies for automation
- Developer makes product code change, also updates the test branch to reflect the ID change,
- Requests a pipeline build and feeds their branch(changelist), and the test branch changelist into the CI/CD
- All tests pass,
- Developer dresses any late code review comments merges code and test branches.
- Done