marlin-mining

There is some work in progress here. The aim is that the examples directory should contain some good examples of merges and intentions.

Name		Name	Last commit message	Last commit date
Latest commit History 149 Commits
controlled-experiment-thorsten-august		controlled-experiment-thorsten-august
controlled-experiment		controlled-experiment
examples		examples
first-parent-merge-diffs		first-parent-merge-diffs
intentions		intentions
merge-diffs		merge-diffs
README.md		README.md
busybox-forks.csv		busybox-forks.csv
chunk_counter.py		chunk_counter.py
clone_conflict.py		clone_conflict.py
commit_ifdefs.py		commit_ifdefs.py
commit_split.py		commit_split.py
commit_statistics.py		commit_statistics.py
get_parents.sh		get_parents.sh
grep-rcptt.py		grep-rcptt.py
grep_feature.sh		grep_feature.sh
grep_ifdefs.sh		grep_ifdefs.sh
grep_preprocessor.sh		grep_preprocessor.sh
list-forks.py		list-forks.py
pull-requests-commits.csv		pull-requests-commits.csv
pull_req_commits.py		pull_req_commits.py
setup_conflict_workspace.py		setup_conflict_workspace.py
setup_merge_workspace.py		setup_merge_workspace.py
task-upload-script.py		task-upload-script.py
vim-forks.csv		vim-forks.csv

Provide feedback