Tutorial of EGit�
NB commandline git is quite easy, so consider not to use EGit, or to use it in combination ☺
EGit reference
NB Need EGit plugin in Eclipse
*NB: the finding of ‘git’ (2.) may seconds up to minutes, depending on network!
1.
2*.
3.
EGit howto:�Clone repo as Eclipse project
(1) Copy URI of your fork
copy
(2) Go to perspective:� Git Repository Exploring
(4) Right click and ‘Import projects’
(5) Next … Finish
Tip:
Remember the git directory so you can use commandline :-)
EGit how to:�Add blessed as ‘remote’ �for daily sync
Add remotes to pull from other repos
(1) In Git repository view:�Right click remotes and ‘paste’
Or use command:
git remote add blessed
git@github.com:molgenis/molgenis.git
(2) Name your remote
(3) edit (advanced)
1.
2.
Edit -> Add All Branches
(4) Save and fetch
EGit howto
Pull remote
In EGit you need to first 'fetch' and then 'merge' for remotes.
(1a) Fetch upstream, daily!
Choose blessed remote, just click finish
Now all changes are downloaded…
Or use command:
git pull blessed master
(1b) Merge changes, daily
(No additional command needed.... see 1a)
Tip: git staging view
or use command:
git status
(2) Resolve conflicts
2. Edit file(s)
1. See conflicts
3. All solved ☺
4. Commit & push
Conflicts are removed from git index; you need to fix and then re-add the file. Before solved, commits and push is impossible.
(3) Commit changes
Symbols:
? new files that are not in git index (will be ignored, see (3))
+ new files that are not yet commited (aka ‘staged’ ready for push)
> uncommitted changes; these are not yet pushed out to your github repo
* Uncommitted changes; these you will push to your github repo
(3b) commit using ‘synchronize’�usefull for ‘hidden files’ such as .ignore
Symbols:
> there are uncommitted changes
? new files that are not in git index (will be ignored, see (3))
+ new files that are not yet commited (aka ‘staged’ ready for push)
normal arrow: change has been committed but not yet pushed
plus arrow: change has not been committed yet (but + so added to index)
Number of commits
(4) Add new files
? Indicate new files that are not in git index
and will be ignored during commits
+ Indicate new files that are indexed
but not yet commited
NB
(5) Undo changes
(6) Push+pull, end-of-each-day
Review changes
Don’t forget to pull; I have to pull to get rid of ↑1
Or use command:
git push origin master
(7) Pull request�to say that your code is ready for all
Tip: history view
Tip: compare to a remote
Watch out: this is not the way to merge changes because you don’t get the commits