Page History

...

https://help.github.com/en/articles/reverting-a-pull-request

Revert a commit

TODO:

Backport the fixes

In SVN we have script to merge and commit the fixes from trunk to release branches.

TODO:

Release management

We will have branch for the release management, currently we have three branches in https://github.com/apache/ofbiz-framework/

trunk, release17.12 and release18.12

Cut a release

In OFBiz, we cut a release and thoroughly test it and then finally make it available to public.

To create a new release, a branch will be cut from trunk. A branch can be cut manually using command line or through the UI of GitHub. Both process are mentioned below.

Manually cut a release branch using command line

Ideally the branch will be cut from trunk branch. So make sure you are on trunk branch.
Here is the example, we have cut the release19.06.

git checkout -b release19.06
git push origin release19.06

Cut the release branch using GitHub UI

Please follow the link below

https://help.github.com/en/articles/creating-and-deleting-branches-within-your-repository

Publish the release

Once the branch is ready to publish, we will cut a tag to the release branch. As per our example above we can cut a tag release19.06.01

A tag can be cut manually using command line or through the UI of GitHub. Both process are mentioned below.

Manually cut a tag using command line

Here is the example, we have cut a tag for release19.06 branch.
Make sure you are on release19.06 branch

git tag release19.06.01
git push origin release19.06

Reference - https://stackoverflow.com/questions/18216991/create-a-tag-in-a-github-repository

Cut the tag branch using GitHub UI

Please follow this link - https://stackoverflow.com/questions/18216991/create-a-tag-in-a-github-repository

Add detached signature and checksum file with release

TODO:

Equivalent of svn:auto-props properties

As mentioned by Jacques Le Roux, we should have equivalent of svn:auto-props properties on server.
Something we will need to not forget when we will switch to Git: https://help.github.com/articles/dealing-with-line-endings/#per-repository-settings

Update the website, wiki documents and references

After the successful migration to Git, we should update this information to various resources like website, wiki documents and references.

•  Update the information related to Git on OFBiz website
  https://ofbiz.apache.org/source-repositories.html
  
•  Update the information related to Git to OFBiz tutorials
  OFBiz Tutorial - A Beginners Development Guide