Switch sync workflow to merge with .gitattributes protection - #895
Merged
Conversation
Replace the mirror/force-push approach with git merge. This works with .gitattributes merge=ours in opal-plus to automatically protect repo-specific files (on_release.yml, tests.yml, README.md) while allowing upstream changes to flow into shared files normally. - Configure merge.ours.driver so .gitattributes merge=ours works - Use git merge instead of reset --hard - No force push needed — regular push since we only add commits - public-master starts from opal-plus/master to preserve customizations Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
✅ Deploy Preview for opal-docs canceled.
|
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
git merge.gitattributesin opal-plus (permitio/opal-plus#10) which marks repo-specific files withmerge=oursmerge.ours.driverin the workflow so the.gitattributesstrategy is respectedgit pushsince merges only add commitspublic-masterstarts from opal-plusmasterso all customizations are preservedHow it works
public-masterfrom opal-plus/master (preserves all opal-plus customizations)git merge opal/master— brings in upstream changes.gitattributes merge=oursautomatically keeps opal-plus's version ofon_release.yml,tests.yml,README.mdclient.py,server.py, etc.) merge normally — opal-plus's small additions (banner imports) auto-resolvePrerequisites
.gitattributesto opal-plusTest plan
🤖 Generated with Claude Code