You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
It's nice to be up to date with the latest development in this main repo. For example I would like to get recently merged #65 in to my own copy of this repo.
As we create copies from this template repo instead of a fork, it's a bit more tricky to make the update. Are there already some instructions on how this can be done?
I did the following to update my own copy. There are for sure easier and better ways, but it did the job for me now.
In my copy of this repo at the master branch:
git remote add template git@github.com:jstrieb/github-stats.gitgit fetch template
# Remove all bot commits to make my git history cleaner. Maybe not necessary?
# Reference: https://stackoverflow.com/a/8058619/265508FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' if [ "$GIT_AUTHOR_EMAIL" = "git@github.com:jstrieb/github-stats.git" ]; then skip_commit "$@"; else git commit-tree "$@"; fi' HEAD
# Squash merge upstream changes in to 1 new commit.git merge -Xtheirs --squash --allow-unrelated-histories template/mastergit commit -m "Update from template"git push -f origin master
I think we should add some instructions to the README on how people can keep their copies up to date with this repo :). If it involves a few shell commands, ideally they should be directly copy-and-pasteable for ultimate user convenience.
It's nice to be up to date with the latest development in this main repo. For example I would like to get recently merged #65 in to my own copy of this repo.
As we create copies from this template repo instead of a fork, it's a bit more tricky to make the update. Are there already some instructions on how this can be done?
I did the following to update my own copy. There are for sure easier and better ways, but it did the job for me now.
In my copy of this repo at the master branch:
I think we should add some instructions to the README on how people can keep their copies up to date with this repo :). If it involves a few shell commands, ideally they should be directly copy-and-pasteable for ultimate user convenience.
Relevant discussion on SO:
https://stackoverflow.com/questions/56577184/github-pull-changes-from-a-template-repository#56577320
The text was updated successfully, but these errors were encountered: