Add upstream-merge workflow for downstream consumers#24
Merged
Conversation
Ship a `.gitattributes` using Git's built-in `merge=ours` driver so forks can run `git fetch template && git merge template/main` without losing their content, uploaded assets, or branding. Protected paths: `src/content/**`, `src/assets/**`, `public/**`. No per-clone driver registration required. README and how-to-use.yaml gain a "Staying up to date with Scaffold" section covering the two-command flow, what's protected, the new-file caveat, and the one-time bootstrap for consumers that forked before `.gitattributes` existed.
✅ Deploy Preview for draftlab-scaffold ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
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.
Ship a
.gitattributesusing Git's built-inmerge=oursdriver so forks can rungit fetch template && git merge template/mainwithout losing their content, uploaded assets, or branding.Protected paths:
src/content/**,src/assets/**,public/**. No per-clone driver registration required.README and how-to-use.yaml gain a "Staying up to date with Scaffold" section covering the two-command flow, what's protected, the new-file caveat, and the one-time bootstrap for consumers that forked before
.gitattributesexisted.