Skip to content

fix: merge in case destination is not master #57

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
merged 1 commit into from
Nov 6, 2025
Merged

fix: merge in case destination is not master #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions handlers/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ func MergeMaster(username, password, repoUrl, branchName, master string) error {
return fmt.Errorf("git config error: %w, output: %s", err, output)
}

if output, err := git.Checkout(workingDir, checkout.Branch(master)); err != nil {
logger.Debug("git checkout error", "branch", master, "output", output)
return fmt.Errorf("git checkout error: %w, output: %s", err, output)
}

if output, err := git.Checkout(workingDir, checkout.Branch(branchName)); err != nil {
logger.Debug("git checkout error", "branch", branchName, "output", output)
return fmt.Errorf("git checkout error: %w, output: %s", err, output)
Expand Down
Loading