Skip to content

Commit

Permalink
Python style fixes
Browse files Browse the repository at this point in the history
Fixed make style command for this branch and corrected method docstrings for run_diff3_analysis.py.
  • Loading branch information
cactusbranch01 committed Mar 21, 2024
1 parent b5b9fa6 commit 4e7771b
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/python/run_diff3_analysis.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
"""Recreates merges on all algorithms with a sample of commits.
"""

import os
from diff3_analysis import diff3_analysis

Expand Down Expand Up @@ -62,6 +65,13 @@


def run_analysis():
"""
Analyzes merge conflicts on a sample of repos with all merge algorithms.
Returns:
None
"""

# Ensure the base output directory exists
base_output_dir = "./merge_conflict_analysis_diffs"

Expand Down

0 comments on commit 4e7771b

Please sign in to comment.