Orion/Manual Test Cases
This page contains some complex test cases that needs manual steps in Orion.
Resolve merge conflicts
The section describes how to resolve conflicts resulted from git merge , by using Orion git status and writable compare editor pages. Please note that the expected result from the test cases only applies in Orion M7. A better solution(possibly 3-way compare) will be addressed after M7 and the same steps will apply. There are 3 test cases in this section. The test cases assume that you have a remote Git repository and a cloned local Git repository. When both of the repositories modify the same file