From f9acc7969084add8aecea75c4b907801fac75464 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 14 May 2017 20:52:19 +0000 Subject: [PATCH] Update README.md bit more logical ordering of content (cherry picked from commit 6cb86e9657e6f21fd0397cf3972403466b772ae0) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1802 7f0cb862-5218-0410-a997-914c9d46530a --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1d19af6..12289ef 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,13 @@ This readme file applies to the git clone of FreeGLUT's svn repo on [sourceforge 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](https://sourceforge.net/p/freeglut/code/HEAD/tree/) 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](http://www.syntevo.com/). Basic workflow upon receiving a pull request is as follows: +I will be unable to merge a pull request if the github clone is behind ``svn/trunk`` on sourceforge.net. Should you detect this, please contact me, maybe through making an issue here on github. + +This copy of the svn repository was not created with ``git svn`` but with the excellent svn support of [SmartGit](http://www.syntevo.com/). + + +Notes to self on how to work with this: + 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 @@ -13,5 +19,3 @@ This copy of the svn repository was not created with ``git svn`` but with the ex ``svn/trunk`` clone as extra meta data is added) - merge ``svn/trunk`` into local ``git_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 sourceforge.net. Should you detect this, please contact me, maybe through making an issue here on github.