Skip to content

Fetch before commit count in merge script #237

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
drn merged 1 commit into from
Mar 15, 2026
Merged

Fetch before commit count in merge script #237

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: 4 additions & 1 deletion agents/skills/merge/scripts/merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ check_commits() {
info "Commits to merge: $count"
}

do_rebase() {
do_fetch() {
info "Fetching ${TARGET}..."
git fetch "$TARGET"
}

do_rebase() {
info "Rebasing onto ${TARGET}/master..."
if ! git rebase "${TARGET}/master"; then
echo "REBASE_CONFLICT" >&2
Expand Down Expand Up @@ -240,6 +242,7 @@ ${COAUTHOR}"

determine_target
get_branch
do_fetch
check_commits

if [[ "$skip_rebase" == false ]]; then
Expand Down
Loading