Changes between Version 15 and Version 16 of github_molgenis
- Timestamp:
- 2012-06-18T14:08:05+02:00 (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
github_molgenis
v15 v16 33 33 On the website: Create a PULL request to: molgenis/molgenis/master This will pack ALL current changes in master to be submitted to molgenis WHICH IS BAD! GOOGLE: “Creating good pull request” ! https://help.github.com/articles/using-pull-requests 34 34 35 == Work within a branch. 36 Create a pull request for 1 branch ! 35 == Work within a branch. == 36 Create a pull request for 1 branch ! 37 37 38 * git branch new_feat 39 * git branch bug_fixes 40 * git checkout new_feat 38 * git branch new_feat 39 * git branch bug_fixes 40 * git checkout new_feat 41 41 42 43 44 Hack AWAY, all commits are to new_feat, when you push the first time: 42 Hack AWAY, all commits are to new_feat, when you push the first time: 45 43 46 44 * git push origin new_feat 47 48 49 45 50 46 == Every morning: == … … 53 49 * git commit (or git stash) 54 50 * Get changes git pull molgenis master Solve any conflict git commit –m “Morning molgenis merge” git push 51 52 == WORD of WARNING == 53 * NEVER force push origin master 54 * If you cannot push, you need to pull ☺ 55 * Force push destroys your fork !!!! 56 * So just never 57 * If you did ☹ you should: Directly delete your repository on the website fork, clone, 58 * remote add -> molgenis/molgenis again 59 * If you have stuff you want to keep: 60 * SAVE the files outside of the repos, and commit them back in after you setup a new remote fork and local repository
