Skip to content

feat: rebase pull request branch on checkout PR #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myakove merged 3 commits into from
Mar 5, 2025
Merged

feat: rebase pull request branch on checkout PR #674

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4816eb
feat: rebase pull request branch on checkout PR
myakove Mar 5, 2025
ca9f777
Merge branch 'main' of github.com:myk-org/github-webhook-server into …
myakove Mar 5, 2025
774ded6
feat: rebase pull request branch on checkout PR
myakove Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions webhook_server_container/libs/github_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,6 +1642,7 @@ def _prepare_cloned_repo_dir(
# Checkout to requested branch/tag
if checkout:
run_command(f"{git_cmd} checkout {checkout}", log_prefix=self.log_prefix)
run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix)

# Checkout the branch if pull request is merged or for release
else:
Expand All @@ -1662,6 +1663,7 @@ def _prepare_cloned_repo_dir(
run_command(
command=f"{git_cmd} checkout origin/pr/{pull_request.number}", log_prefix=self.log_prefix
)
run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix)

yield

Expand Down