From 743e1500224057eb498fdf3e83b62574bbb0b51c Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 17 Mar 2018 10:10:10 +0000 Subject: [PATCH] Update no-git-submissions.md --- docs/no-git-submissions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/no-git-submissions.md b/docs/no-git-submissions.md index 7fb9326..a2e2f60 100644 --- a/docs/no-git-submissions.md +++ b/docs/no-git-submissions.md @@ -9,8 +9,8 @@ After (optional) discussion in the issue's thread and if the content is deemed f #### Learning git for further contributions -It would of course ease the burden on community members if returning contributors learn the few basic git concepts required to submit pull requests themselves, but this is of course not a requirement. +It would of course ease the burden on community members if returning contributors learn the few basic git concepts required to submit pull requests themselves. The official Qubes OS documentation [contribution guidelines](https://www.qubes-os.org/doc/doc-guidelines/) is a good start. It is based on contributing to the official qubes-doc repository but is applicable to any other project. -However the guide doesn't approach the problem of keeping a forked repository synchronized with "upstream" (eg. the official repository). This isn't a trivial problem ([github help page]](https://help.github.com/articles/syncing-a-fork/)), especially when you have made changes in your forked repository ([stackoverflow post](https://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository)). So until you are proficient enough to understand the steps involved, a simple alternative that does not require command line usage is to delete the forked repository and re-fork it from upstream. This is a bit of a "nuclear" option though and you'll obviously loose any changes you've made in your forked repository. +However the guide doesn't approach the problem of keeping a forked repository synchronized with "upstream" (eg. the official repository). This isn't a trivial problem ([github help page](https://help.github.com/articles/syncing-a-fork/)), especially when you have made changes in your forked repository ([stackoverflow post](https://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository)). So until you are proficient enough to understand the steps involved, a simple alternative that does not require command line usage is to delete the forked repository and re-fork it from upstream. This is a bit of a "nuclear" option though and you'll obviously loose any changes you've made in your forked repository.