From 6170995665a4d72814608f9e359902d0b19448a8 Mon Sep 17 00:00:00 2001 From: Patryk Kowalski Date: Mon, 24 Jul 2023 16:58:11 +0200 Subject: [PATCH] replaced hardcoded main with actual target_branch name' --- pr_agent/git_providers/local_git_provider.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_agent/git_providers/local_git_provider.py b/pr_agent/git_providers/local_git_provider.py index 86673016..35439b65 100644 --- a/pr_agent/git_providers/local_git_provider.py +++ b/pr_agent/git_providers/local_git_provider.py @@ -72,7 +72,7 @@ class LocalGitProvider(GitProvider): try: logging.debug('Rebasing the temporary branch on the main branch...') - self.repo.git.rebase('main') + self.repo.git.rebase(self.branch_name) except GitCommandError as e: raise ValueError('Error while rebasing. Resolve conflicts before retrying.') from e