From a5aae12807b3acbf6112551fac6eb454cdda5e1a Mon Sep 17 00:00:00 2001 From: Immanuel Bayer Date: Thu, 14 Jan 2016 18:21:21 +0100 Subject: [PATCH] rm dev_notes.rst --- dev_notes.rst | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 dev_notes.rst diff --git a/dev_notes.rst b/dev_notes.rst deleted file mode 100644 index e7ecd36..0000000 --- a/dev_notes.rst +++ /dev/null @@ -1,23 +0,0 @@ -workon on new feature ---------------------- -1) private-fastFM-core/new_feature - -release new feature -------------------- -2) git fetch upstream -3) git checkout master -4) git merge upstream/master -5) git merge new_feature -5.1) git push origin - -change to public repo ``fastFM-core`` ------------------------------------- -6) git fetch private -7) git branch release -8) git checkout release -9) git merge private/master -10) git checkout master -11) git merge --squash release -12) git commit -m 'new feature' -13) git push origin -14) clean up: git branch -D release