fix: gitignore mutable zallet configs to prevent git pull conflicts#31
Open
gustavovalverde wants to merge 1 commit intodevfrom
Open
fix: gitignore mutable zallet configs to prevent git pull conflicts#31gustavovalverde wants to merge 1 commit intodevfrom
gustavovalverde wants to merge 1 commit intodevfrom
Conversation
Users following the README modify config/zallet.toml (network setting) and regtest-init.sh modifies config/regtest/zallet.toml (pwhash). These tracked files caused conflicts on git pull. - Ship .default templates (tracked) alongside gitignored live copies - regtest-init.sh and CI seed from .default automatically - zaino configs stay tracked (never modified by users/scripts)
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
.defaulttemplates (tracked) for zallet configs, gitignore the live copiesregtest-init.shauto-seeds from.defaultbefore modifyingcp -nto seed on first runProblem
Following the README produces dirty tracked files:
config/zallet.toml— user editsnetworkfor testnetconfig/regtest/zallet.toml—regtest-init.shinjects pwhashThese cause conflicts on
git pull.Verified
Both mainnet and regtest paths tested end-to-end:
.defaultgit diffshows zero tracked changes after setup