Skip to content

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

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
sebastientaggart merged 2 commits into from
Mar 26, 2026
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83e7a0
Merge pull request #26 from LightbridgeLab/dev
sebastientaggart Mar 26, 2026
c980fc5
Pull before push in deploy targets to prevent non-fast-forward errors
Mar 26, 2026
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ endif

# Push the integration branch for preview/testing.
deploy-preview:
git pull --rebase origin $(INTEGRATION_BRANCH)
git push origin $(INTEGRATION_BRANCH)

# Publish a tagged release to production.
deploy-prod:
git pull --rebase origin $(PRODUCTION_BRANCH) --tags
git push origin $(PRODUCTION_BRANCH) --tags