Skip to content

Fix deploy targets failing when local branch is behind remote#28

Merged
sebastientaggart merged 2 commits into
devfrom
feature/fix-deploy-pull
Mar 26, 2026
Merged

Fix deploy targets failing when local branch is behind remote#28
sebastientaggart merged 2 commits into
devfrom
feature/fix-deploy-pull

Conversation

@sebastientaggart

Copy link
Copy Markdown
Member

Add git pull --rebase before git push in both deploy-preview and deploy-prod Makefile targets. This prevents non-fast-forward errors when the remote branch has commits (e.g., GitHub merge commits) not present locally.

Issue #27

@sebastientaggart

Copy link
Copy Markdown
Member Author

Review Summary

Verdict: APPROVE

Findings

No issues found. Code looks correct and follows project conventions.

The change adds git pull --rebase before git push in both deploy-preview and deploy-prod targets, which correctly prevents non-fast-forward push failures when the remote branch has diverged (e.g., GitHub merge commits). Using --rebase is the right choice here to keep a linear history and avoid unnecessary merge commits during deployment.

@sebastientaggart
sebastientaggart merged commit 15d768e into dev Mar 26, 2026
2 checks passed
This was referenced Mar 26, 2026
@sebastientaggart
sebastientaggart deleted the feature/fix-deploy-pull branch April 8, 2026 14:44
sebastientaggart added a commit that referenced this pull request Apr 8, 2026
Fix deploy targets failing when local branch is behind remote
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant