The project documentation (stored in the docs directory) is a git subtree of the project wiki. This allows for the documentation to be referenced and edited from within the main project.
When cloning the main project repository for the first time, the wiki repository must be added as a remote.
git remote add wiki https://github.com/<user>/<repo>.wiki.git
New and updated documentation should be committed and pushed in the main project repository just like any other file.
However, care should be taken to ensure documentation files are always committed separately from other project files. Individual commits should never contain both files inside and outside the docs directory.
Documentation changes in the main project repository can be pushed to the wiki repository at any time. This does not need to happen every time documentation is added or updated, but can happen as often as desired.
git subtree push --prefix docs wiki master
If the GitHub website is used to edit wiki files, the push will fail, in which case any updates should be pulled as described below.
It should only be necessary to pull updates directly from the wiki when the GitHub website is used to edit the documentation directly in the wiki. If pushing to the wiki ever fails, try pulling first.
git subtree pull --prefix docs wiki master --squash --message="Merge wiki updates into docs."
We are trying to set this up and keep getting errors. Could you please help and provide steps on how to set up the docs folder to be a git subtree inside of the main project repo?
I keep getting the following error: failed to push some refs to 'https://github.com/kahopkin/MainRepo.wiki.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart.
I tried to find any docs or resources to help me get through and be able to push from the docs folder to the wiki.git, but so far no success.