A fork of the myproxy project from the CILogon repository. This repository is structured into two branches:
The master branch is a clean copy of the remote repository mentioned above. Changes to the remote trunk have to be synced manually into the master branch in order to keep this repository up to date. In order to keep track of versions, the revision number of the remote trunk being synced is incuded into the commit messages.
The devel branch contains a modified version of the myproxy project hosted under the master branch. The purpose of the branch was to implement:
- The GetProxy Endpoint
- Updated set of commands from the MyProxy Protocol (GET, INFO, PUT, STORE)
If you are trying to build Master Portal or VO Portal you should check out and build this devel branch first!
In order to keep the devel branch up to date with new modification coming from the remote trunk you have to:
- Check out master branch
git checkout master - Update the master branch with the latest changes from the remote trunk
- Commit changes into master (include revision number of remote trunk in commit)
git commit -a -m '#rev' - Check out devel branch
git checkout devel - Merge the master branch into the devel branch
git merge master - Solve any potential conflicts
- Push changes
git push