Version 19 (modified by 12 years ago) (diff) | ,
---|
- Create account @ https://github.com/
- Fork https://github.com/molgenis/molgenis & https://github.com/molgenis/molgenis_apps
- download github command line version
configure
https://help.github.com/articles/set-up-git
- @commandline try retrieving projects by CLONING (Fork a repository online (molgenis/molgenis)) :
- create folders, cd there and try (Clone it to your HDD) . After forking a molgenis
- repos: git clone git@…:<yourname>/molgenis.git
- git clone https://github.com/<username>/molgenis.git
- git clone https://github.com/<username>/molgenis_apps.git
- git remote add molgenis https://github.com/molgenis/molgenis.git
- git remote add molgenis https://github.com/molgenis_apps/molgenis_apps.git
- git remote
- git remote -v
- Pull from the remote
update project = pull project
- Go into the directory molgenis git pull --all
"commit" = push a change :
- Edit a file vi DEVELOPERS
- git add filename
- git status
- git diff
- git commit -a (Commit the code locally, ) or git commit –m ‘Changed a file’
- git status
- git push origin ( If your done update your ‘fork’ git push, Push the local commits to your repository)
- git push origin master (Add an upstream remote)
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
Work within a branch.
Create a pull request for 1 branch !
- git branch new_feat
- git branch bug_fixes
- git checkout new_feat
Hack AWAY, all commits are to new_feat, when you push the first time:
- git push origin new_feat
Every morning:
- PULL from the molgenis organisation : *git remote add molgenis git://github.com/molgenis/molgenis.git
- GIT STATUS -> if changes:
- git commit (or git stash)
- Get changes git pull molgenis master Solve any conflict git commit –m “Morning molgenis merge” git push
WORD of WARNING
- NEVER force push origin master
- If you cannot push, you need to pull ☺
- Force push destroys your fork !!!!
- So just never
- If you did ☹ you should: Directly delete your repository on the website fork, clone,
- remote add -> molgenis/molgenis again
- If you have stuff you want to keep:
- SAVE the files outside of the repos, and commit them back in after you setup a new remote fork and local repository
Git @ eclipse
http://www.vogella.com/articles/EGit/article.html
Troubleshooting
Problem with push in eclipse : http://stackoverflow.com/questions/9003840/how-do-i-push-to-git-repo-given-the-following-error-an-internal-exception-occur
2[ down vote] | I faced the same problem and I found out solution which is extremely foolish. I took following steps: * I logged into git repository of my project from browser and didn't sign out. * I copied the http url to push or pull from project repository from github. * I pasted the url in my eclipse plugin while pushing code (didn't use the already stored one even though both of them were same) I don't know what and why but above steps have worked for me whenever I have faced above problem. I don't know why does eclipse throw such exceptions and why does it gets solved this way. You can also try pushing using other ways outside of eclipse. for eg. `TortoiseGit` or `SmartGit` etc. |