Merge pull request #9 from openrails/feature/improved-merging

fix: Clean up working tree when resetting commits

Author: twpol

Git/Project.cs

@@ -49,6 +49,11 @@ public void ResetHard()
             RunCommand("reset --hard");
         }
 
+        public void Clean()
+        {
+            RunCommand("clean --force -d -x");
+        }
+
         public void Merge(string reference)
         {
             RunCommand($"merge --no-edit --no-ff {reference}");

Program.cs

@@ -86,6 +86,7 @@ static async Task AsyncMain(IConfigurationRoot config)
             git.Init($"https://github.com/{gitHubConfig["organization"]}/{gitHubConfig["repository"]}.git");
             git.Fetch();
             git.ResetHard();
+            git.Clean();
             var baseBranchCommit = git.ParseRef(gitHubConfig["baseBranch"]);
             var mergeBranchCommit = git.ParseRef(gitHubConfig["mergeBranch"]);
             var mergeBranchTree = git.ParseRef($"{mergeBranchCommit}^{{tree}}");
@@ -110,6 +111,7 @@ static async Task AsyncMain(IConfigurationRoot config)
                 {
                     autoMergePullRequestsFailure.Add(pullRequest);
                     git.ResetHard();
+                    git.Clean();
                     Console.WriteLine($"Error: {error.Message}");
                 }
             }