diff --git a/docs/faq/faq.md b/docs/faq/faq.md index bf59b32b8..dc6742702 100644 --- a/docs/faq/faq.md +++ b/docs/faq/faq.md @@ -1,3 +1,4 @@ # FAQs - [001 - How do I debug JSON Messages on the Wire](debugging_json_messages) +- [002 - Working on other peoples Git remotes](git_remotes) diff --git a/docs/faq/git_remotes.md b/docs/faq/git_remotes.md new file mode 100644 index 000000000..5697f7eb9 --- /dev/null +++ b/docs/faq/git_remotes.md @@ -0,0 +1,23 @@ +# Working on other people's Git remotes + +```bash +# change forkname for the fork you want to use +git remote add https://github.com//vuu.git + +# check remote has been added +git remote -v + +# fetch the remote +git fetch + +# check out the branch +git checkout -b --track / + +``` +## Merging into your local working branch + +(make sure you're checked out on your working branch and that you've already added their remote and fetched as above) +```bash +git merge / +``` +