Skip to content
Duckki Oe edited this page Dec 5, 2022 · 4 revisions

Branch management

  • master branch: This should be in sync with the upstream origin/master branch (using GitHub UI).
    • When we contribute back to crytic, we will create new branches based off of master branch.
  • certik branch: This is our own development branch and all CertiK-specific changes will be in this branch. We don't contribute these commits back to crytic.
    • When we merge from upstream, we merge the specific commit/tag into the certik branch.
    • Before merging, the master branch should be synced with the upstream (using GitHub UI).
    • Perform merging on local repo (create a commit saying "Merging the release X.Y.Z into certik") and then create a PR.
  • dev branch: This is used by the crytic devs and we don't use this branch.
Clone this wiki locally