When deploying US1 and US2 in the same promotion, the old code in US2 is overwritting
the most up-to-date code in US1. How can a developer resolve this issue?
Select an option, then click Submit answer.
-
○
Resolve the conflict manually using the Online Conflict Resolution feature. (Might be this ans)
-
○
Commit the code again in US1 before deploying.
-
○
Use the Order User Stories by field in the Promotion record.
-
○
Commit the code again in US2 before deploying.