Skip to content

Commit

Permalink
Add overview to README
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Nov 14, 2024
1 parent bdf26ec commit 331aba2
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,28 @@
![check-style](https://github.com/benedikt-schesch/AST-Merging-Evaluation/actions/workflows/check-style.yml/badge.svg)
![check-reproducibility](https://github.com/benedikt-schesch/AST-Merging-Evaluation/actions/workflows/check-reproducibility.yml/badge.svg)

This is an experimental framework for comparing version control merging algorithms.
It runs each merge tool on 6045 real-world merges.
It classifies each merge as a conflict, a correct merge, or an incorrect merge.
It uses each project's test suite to determine whether the merge was correct,
and it penalizes merge tools for creating incorrect merges.

The paper [Evaluation of Version Control Merge
Tools](https://homes.cs.washington.edu/~mernst/pubs/merge-evaluation-ase2024-abstract.html)
evaluates 16 merge algorithms, including
[Hires-Merge](https://github.com/paulaltin/git-hires-merge),
[IntelliMerge](https://github.com/Symbolk/IntelliMerge),
[Plume-lib Merging](https://github.com/plume-lib/merging), and
[Spork](https://github.com/ASSERT-KTH/spork).
Since then, the framework has been expanded to evaluate newer algorithms,
such as
[Mergiraf](https://mergiraf.org/).

## Requirements

### Download the cached data

Download the compressed cached data [here](https://zenodo.org/records/13366866) and put it in the root directory of the project. Be aware the the uncompressed cache size is 84GB as of 09-23-2024.
Download the compressed cached data [here](https://zenodo.org/records/13366866) and put it in the root directory of the project. Be aware the the uncompressed cache size is 84GB as of 2024-09-23.

### Python

Expand Down

0 comments on commit 331aba2

Please sign in to comment.