Orion/Manual Test Cases

From Eclipsepedia

Jump to: navigation, search

This page contains some complex test cases that needs manual steps in Orion.

Contents

Resolve merge conflicts

There are 3 test cases in this section. The test cases assume that you have a remote Git repository and a cloned local repository. When both the repositories modify the same file at the same places , conflicts may happen and manual merge is needed in Orion to resolve the conflicts. Before executing the test cases you need to do:

  • In your server's local drive , find a folder and use Git Bash there.
  • In Git bash , use "git init remote". This will create an empty git repository called remote.
  • In git bash , use "git clone remote local".This will clone a git repository called local.
  • In Orion , create two folders and link the full path of "remote" and "local" , respectively.

Both repository modified the same file

Remote deletes and local modifies the same file

Remote modifies and local deletes the same file

other cases