git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1632 7f0cb862-5218-0410-a997-914c9d46530a
1.3 KiB
1.3 KiB
FreeGLUT
This readme file applies to the git clone of FreeGLUT's svn repo on sourceforge.net that is hosted on github. This is provided here to enable user to contribute easier.
Every effort is made to ensure that the git_master
branch only progresses in a fastforward manner, but complete guarantees cannot be given as the sourceforge.net trunk is at all times leading.
This copy of the svn repository was not created with git svn
but with the excellent svn support of SmartGit. Basic workflow upon receiving a pull request is as follows:
- Merge pull request on github
- pull in changes to my local clone of the
git_master
branch. - cherry pick the merged commits onto my local clone of the
svn/trunk
branch - push these commits to svn remote (this alters the commits in the local
svn/trunk
clone as extra meta data is added) - merge
svn/trunk
into localgit_master
- push merge commit to github (its fast forward!)
I will be unable to merge a pull request if the github clone is behind svn/trunk
on srouceforge.net. Should you detect this, please contact me, maybe through making an issue here on github.