Skip to content

Latest commit

 

History

History
49 lines (34 loc) · 1.26 KB

git-workflow.md

File metadata and controls

49 lines (34 loc) · 1.26 KB
Raw

git contribution workflow

We develop using triangular workflows on git.

For local deployment please create a fork of the Toucan Protocol OffsetHelper repo.

Clone your fork:

git clone git@github.com:YOURUSERNAME/OffsetHelper.git
git config remote.pushdefault origin
git config push.default current

next add the root repository as upstream:

git remote add upstream git@github.com:ToucanProtocol/OffsetHelper.git
git fetch upstream

Run:

git remote -v

and you should see something like:

origin	git@github.com:YOURUSERNAME/OffsetHelper.git (fetch)
origin	git@github.com:YOURUSERNAME/OffsetHelper.git (push)
upstream	git@github.com:ToucanProtocol/OffsetHelper.git (fetch)
upstream	git@github.com:ToucanProtocol/OffsetHelper.git (push)

Feature flow:

git checkout main && git pull --ff-only upstream main

Cmd+shift+. to copy your issue number from linear, and use it as your branch name:

git checkout -b co2-190-small-edits-on-the-home-page

To open a PR push to your fork and open your PR to ToucanProtocol/OffsetHelper.