Publishing new changes

Overview

Publishing the changes from staging to master is a two-step process.

Step 1: Push the changes to master

• After all the required changes are merged to staging, raise a PR from staging to master.

• Merge the PR.

• Verify the https://docs.openebs.io reflects the changes.

Step 2: Rebase staging.

This step can be performed only by OpenEBS Docs maintainers. This step is required to sync the commit hashes between staging and master, so that the next PR from staging to master - will not keep showing already merged changes.

git clone https://github.com/<forked-repo>/openebs-docs.git
cd openebs-docs
git remote add upstream https://github.com/openebs/openebs-docs.git
git branch
git config --global core.editor vim

git checkout staging
git pull upstream staging
git push

git checkout master
git pull upstream master
git push 

git checkout staging
git rebase -i master
# If some commits are shown in the vi editor, drop them.
# If both branches are in sync, the vi editor will show noop. 
git status
# Will display difference in commits. 
# Example:
# ------------------------------------------------------------
# On branch staging
# Your branch and 'origin/staging' have diverged,
# and have 8 and 8 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
# ------------------------------------------------------------ 
git push -f origin staging

## Try to raise a PR for merging forked repo staging with upstream staging
Latest PRs which pushed to master will be showing

## Try to raise a PR for merging local repo staging with upstream master
No items will be there

## As admin, the force-push access should be enabled on the openebs-docs staging branch
git push -f upstream staging
## As admin, the force-push access should be disabled on the openebs-docs staging branch

## Try to raise a PR for merging forked repo staging with upstream staging
No items will be there

## Try to raise a PR for openebs-docs staging with openebs-docs master. 
No items will be there