Added cd /d and git checkout call in git_tasks steps of automatic merge

Co-authored-by: dtmaclaren <[email protected]>

Author: esmith1729

installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py

@@ -100,6 +100,9 @@ def automatic_merge_of_git_remote(self, branch_to_merge_from, branch_to_merge_to
         if self.prompt.confirm_step(automatic_prompt):     
             try:
                 try:
+                    subprocess.check_call(f"cd /d {dir}", shell=True)
+                    print(f"     cd: {dir}")
+                    print(f"     checkout: {repo.git.checkout(f'{branch_to_merge_to}')}")
                     print(f"     fetch: {repo.git.fetch()}")
                     print(f"     merge: {repo.git.merge(f'{branch_to_merge_from}')}")
                 except git.GitCommandError as e:

installation_and_upgrade/ibex_install_utils/tasks/update_scripts.py

@@ -23,6 +23,3 @@ def update_scripts(self):
     prompt = UserPrompt(True,False)
     print(COMPUTERNAME)
     UpdateScripts(prompt, "", "", "", "", "").update_scripts()
-
-
-