Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Latest commit

 

History

History
31 lines (21 loc) · 820 Bytes

gitflow.md

File metadata and controls

31 lines (21 loc) · 820 Bytes
Raw

Gitflow Workflow as used by AppNav Dev Team

To setup project directory on dev machine:

  1. git clone https://github.ibm.com/WASCloudPrivate/prism.git
  2. cd prism
  3. git clone https://github.ibm.com/WASCloudPrivate/helm-chart-prism.git

To develop an issue - e.g. in prism repo

Setup branch:

  1. cd prism
  2. git checkout integration
  3. git pull
  4. git checkout -b issue#nnn [optional short description]

Make changes.

Check in work:

  1. git add .
  2. git commit -m 'comment about what you changed'
  3. git push origin issue#nnn [optional short description]

In Git:

  1. create a PR to integreate issue#nnn into integration - i.e. integration <- issue#nnn
  2. have your PR peer-reviewed
  3. ensure your builds are successful
  4. merge your PR and delete your branch (issue#nnn [optional short description])