Versions Compared

Old Version 27

changes.mady.by.user Chris Hyzer (upenn.edu)

Saved on

compared with

New Version 28

changes.mady.by.user Chris Hyzer (upenn.edu)

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • Master is the dev branch.  If a new release was just cut, master might be the current release.  
  • Once work is needed on the next release a branch will be created.  
  • Branch names must follow the convention: GROUPER_2_3_0

  • Commits on released branches should only be made when a patch will be made. 
    After patch is made, tag the branch with this convention: grouper_X_Y_Z-aWW-uV-wU-pT e.g. grouper_2_4_0-a21-u9-w2-p2

    Code Block
    (master) $ git tag grouper_2_4_0-a25-u11-w2-p2
(master) $ git push --tags


  • When committing (pull request or direct commit), you should have one JIRA associated with the commit.  

    Code Block
    GRP-1279: grouper installer should set sql logging to on so we can see progress of DDL on install or upgrade
 
If there are more commits on the same issue, number them:
 
GRP-1279: grouper installer should set sql logging to on so we can see progress of DDL on install or upgrade (commit 2)
GRP-1279: grouper installer should set sql logging to on so we can see progress of DDL on install or upgrade (commit 3)


  • Every commit must have a unique comment (from all other commits).  This is so we can go back and see what hasnt been merged
  • Every commit in a non-master branch that should be merged forward must be cherry picked by the developer into all newer branches including master at the time of the commit
  • Pull requests must be on a recent pull of the branch the request is destined for so there are no conflicts

  • All new/edited junit tests should be included in patches (CH I think we need to change the installer to make this happen, its not that simple...)

  • file names should be unique across grouper to make patching easier.  (even across projects, and being in a different package or folder doesnt count)

Git Tips

Developers must create a separate (local) branch for a specific feature if a commit is not for an immediate patch.  That dev local branch should be named something like: GRP-1966-ui-visualization,  During development, multiple interim commits can be made and then squashed into a single commit for the main branch. Before merging to the main branch, switch back to the main branch, do a git pull to get the latest commits made by others. Then, switch back to the feature branch and do a rebase from the main branch. This makes your code apply to the main branch HEAD, rather than the historical commit where your branch started. The rebase changes the start of your branch to the main branch HEAD, and then replays all of your feature commits on top of it. If there are any merge conflicts, you will discover them now instead of later when trying to merge your feature. You can also test this updated code, to ensure it works before committing it to the main branch.

...