Skip to content

Resolving merge conflicts

A guide to resolving merge conflicts

When you come to merge your pull request, you may find that conflicts prevent automated merging back into the master. In some cases, GitHub supports resolution of these through its web interface. However, probably due to file size, this is not currently supported for cl-edit.owl.

The majority of the time, the conflict is trivial - due to addition of new terms to the same point in the file. Because terms are ordered in the file by ID, this happens whenever two edits add terms without any intervening IDs. Trivial clashes are easy to spot - they involve whole term stanzas + declarations.

Occassionally non-trivial clashes will happen when two pull requests include edits to the same term or even the same axiom. Ask an editor for help if you don't feel confident resolving these.

SOP.

  1. Reserialise the Master file using the Ontology Development Kit (ODK). This requires setting up Docker and ODK. If not already set up, follow the instructions here.

  2. Open Docker.

  3. At the line command (PC) or Terminal (Mac), use the cd (change directory) command to navigate to the repository's src/ontology/ directory. For example,

''' cd PATH_TO_ONTOLOGY/src/ontology/ '''

Replace "PATH_TO_ONTOLOGY" with the actual file path to the ontology. If you need to orient yourself, use the '''pwd''' (present working directory) or '''ls''' (list) line commands.

  1. If you are resolving a conflict in an .owl file, run:

''' sh run.sh make normalize_src '''

If you are resolving a conflict in an .obo file, run:

''' sh run.sh make normalize_obo_src '''

  1. In CL, edits sometimes result in creating a large amount of uninteded differences involving ^^xsd:string. If you see these differences after running the command above, they can be resolved by following the instructions here.

  2. In GitHub Desktop:

  3. Checkout Master and pull to make sure your Master branch is up to date.

  4. Checkout the branch for the pull request and make sure it is up to date.

  5. Choose Branch > Update from master: image

  6. GitHub desktop should detect the clash and ask you if you want to open in your text editor of choice (e.g., Atom).

  7. If clashes are due to trivial ordering problems, delete the conflict marks (<<<<<<<, =======, >>>>>>>), commit and push back to GitHub.
  8. Check the resulting diffs on the Pull Request on GitHub.
  9. Once the checks have run and are successful, merge and delete the branch.