TriBITS Wiki Repo

This repo:

• https://github.com/TriBITSPub/TriBITSWiki

exists to facilitate Pull Requests for changes to the TriBITS wiki https://github.com/TriBITSPub/TriBITS/wiki provided by cloning the repo [email protected]:TriBITSPub/TriBITS.wiki.git.

First, create a fork of the GitHub repo:

• https://github.com/TriBITSPub/TriBITSWiki

to hold your topic branches.

The workflow is to first set up the local repo and remotes so the local 'master' branch is pointing to 'master' in the production repo [email protected]:TriBITSPub/TriBITS.wiki.git and a remote exists for your fork my-fork of the TriBITSWiki repo:

$ git clone -o production [email protected]:TriBITSPub/TriBITS.wiki.git TriBITSWiki
$ cd TriBITSWiki/
$ git remote add my-fork [email protected]:<your-github-id>/TriBITSWiki.git

With the above setup, the local 'master' branch will track the branch 'production/master'.

To create a new topic branch, always create it off of the 'master' branch from the 'production' repo, and make changes and push as:

$ cd TriBITSWiki/
$ git checkout master
$ git pull   # Pulls from 'production/master'
$ git checkout -b <my-topic-branch>
<make changes to files and create commits>
$ git push -u my-fork HEAD

Then, create a Pull Request (PR) for the branch <my-topic-branch> from your fork https://github.com/<your-github-id>/TriBITSWiki.git against the 'master' branch in the repo:

• https://github.com/TriBITSPub/TriBITSWiki

The PR will then be reviewed and changes suggested if any.

The PR in the repo https://github.com/TriBITSPub/TriBITSWiki will not get directly merged. Instead, the topic branch from this PR will need to be manually merged to the 'master' branch of the repo [email protected]:TriBITSPub/TriBITS.wiki.git and then the 'master' branch of that repo must be manually merged to the repo [email protected]:TriBITSPub/TriBITSWiki.git to close the PR. The syncing of the 'master' branch will cause GitHub to automaticallly close the PR and show it as 'merged'.

NOTES:

• The 'master' branch from the repo [email protected]:TriBITSPub/TriBITSWiki.git must never be merged to the 'master' branch of the repo [email protected]:TriBITSPub/TriBITS.wiki.git (only the opposite direction). The repo TriBITSWiki 'master' branch has extra commits like for this REAMDE.md file that we never want to be displayed on the production wiki site.

• Before the PR is open, the 'master' branch from the repo [email protected]:TriBITSPub/TriBITS.wiki.git must be merged to the 'master' branch of the repo [email protected]:TriBITSPub/TriBITSWiki.git. Otherwise, the PR created from the 'master' branch of the repo [email protected]:TriBITSPub/TriBITS.wiki.git will show more commits and diffs than just unique to this PR topic branch. Currently, that sync of the 'master' branch must be done manually. In the future, it could be done automatically through a syncing cron job.