Github Workflow

Table of contents

• Work w/ tickets!
• Pushing your changes
• Branch behind? do rebase!
• Still in staging branch?
• Merge to staging (for reviewers)

Work w/ tickets!

git checkout -b DY-<ticket number> origin/staging

1. Go to projects kanban board
2. Locate your ticket
3. Right sidebar scroll down to development
4. Connect your ticket

Pushing your changes

Please refer to Conventional commits for the format of your commit messages

git add .
git commit -m "your message here"
git push origin <current branch name>

1. Create a PR (Pull Request)
2. Move the ticket to "For review" column
3. In case of errors:

git push origin <current branch name> --force

Branch behind? do rebase!

Do this first before pushing your changes if you are behind!

git fetch origin staging
git rebase origin/staging

Stash if you can't rebase

git stash
git fetch origin staging
git rebase origin/staging
git stash pop

Fix possible merge conflicts

Still in staging branch?

Move to a remote branch

git checkout -b DY-<ticket number> origin/staging

If you can't move, stash!

git stash
git checkout -b DY-<ticket number> origin/staging
git stash pop

Merge to staging (for reviewers)

1. Do not merge!
2. Press the dropdown beside merge button
3. Click rebase & merge

If you have problems with the workflow never hesitate to ask questions

1 ticket 1 branch rule, make sure to only have 1 branch for each ticket for easier monitoring and reviews

Workflow by Sam Dacara