Loading...


Related Products


How does RA handle merge conflicts during step 3 of the update process?

If RA’s automated update process cannot complete a merge of the RA update branch back into your preferred development branch, a member of the RA team will attempt to manually merge the branch. If there is a conflict, RA will review the conflict, and depending on the nature of the conflict, RA may attempt to complete the merge using a merge strategy.

In the merge strategy, RA will decide whether to resolve the merges in favor of the currently-deployed branch, or in the new branch. This decision will be applied to all files with merge conflicts.

If a merge strategy does not resolve the conflicts, or if you prefer to review each conflict and decide which version of a file to keep, then you or your development team must resolve the merge conflicts.

Merge conflicts are otherwise out of scope for RA.

Did not find what you were looking for?

If this content did not answer your questions, try searching or contacting our support team for further assistance.

Back to Section navigation