Skip to main content

Git Basics

Creating Feature Branch

  • git checkout base-branch
  • git fetch upstream
  • git rebase upstream/base-branch
  • git push origin base-branch
  • git checkout -b feature-branch

Adding Changes

  • git add .
  • git commit -m Message
  • git push origin HEAD

Updating Pull Request

  • git checkout feature-branch
  • git fetch upstream
  • git rebase upstream/base-branch
  • Make the changes to your files
  • git commit -m Message
  • git push origin HEAD --force

Rebasing

  • git checkout feature-branch
  • git fetch upstream
  • git rebase upstream/base-branch
  • (you may need to git {rm/add} <files> at this point)
  • git status
  • git push origin HEAD --force

Build Preview

  • asciibinder clean
  • asciibinder build -d openshift-enterprise
  • openshift-docs/_preview/openshift-enterprise/<feature_branch>/welcome/index.html

Updating Repo For New Release

  • git checkout main
  • git checkout enterprise-X.XX
  • git push -u origin enterprise-X.XX