Locator changes and corresponding updates in automated checks: What sequence/procedure do you follow?

You might just be having a workflow branching problem, the gitflow discussion might help Git - branching strategies for automation

  1. Developer makes product code change, also updates the test branch to reflect the ID change,
  2. Requests a pipeline build and feeds their branch(changelist), and the test branch changelist into the CI/CD
  3. All tests pass,
  4. Developer dresses any late code review comments merges code and test branches.
  5. Done