-
Notifications
You must be signed in to change notification settings - Fork 7
VCS
Gary Kim edited this page Mar 3, 2020
·
2 revisions
This document outlines how Git is used for the development of SAS Powerschool Enhancement Suite.
Merges are mostly done through the GitHub interface but can also be done via the command line.
SAS PES uses merge commits to merge branches. The only exception to this rule is for new release commits (those that bump the release number and add a changelog). New release commits should be merged with --ff-only.
Branches that are merged should not have any merges from master. The branch should be rebased on top of master instead.