From 4e7771b7d14ada9e19daf4ab1bc00ef6d0b98a0c Mon Sep 17 00:00:00 2001 From: cactusbranch01 Date: Thu, 21 Mar 2024 08:44:36 -0700 Subject: [PATCH] Python style fixes Fixed make style command for this branch and corrected method docstrings for run_diff3_analysis.py. --- src/python/run_diff3_analysis.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/python/run_diff3_analysis.py b/src/python/run_diff3_analysis.py index 9ccb7f2a84..d5ff7d3342 100644 --- a/src/python/run_diff3_analysis.py +++ b/src/python/run_diff3_analysis.py @@ -1,3 +1,6 @@ +"""Recreates merges on all algorithms with a sample of commits. +""" + import os from diff3_analysis import diff3_analysis @@ -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"