Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EclipseLink/Development/Process/Git"
< EclipseLink | Development | Process
(→EclipseLink Git FAQ) |
(→What tools do you recommend, what are their strengths and weaknesses?) |
||
| Line 25: | Line 25: | ||
=== After the server branches, how do I get the information to my local repo? === | === After the server branches, how do I get the information to my local repo? === | ||
| − | === What tools do you recommend, what are their strengths and weaknesses? === | + | === What tools do you recommend, what are their strengths and weaknesses? === |
| + | |||
| + | ==== Windows ==== | ||
| + | |||
| + | For those currently using Tortise SVN with Windows, I would recommend using Tortoise Git. | ||
| + | |||
| + | Download and install the latest Git for Windows All the versions appear to be beta/preview, so just pick the latest. | ||
| + | |||
| + | *[http://code.google.com/p/msysgit/downloads/list http://code.google.com/p/msysgit/downloads/list | ||
| + | ] <span id="fck_dom_range_temp_1332162864861_298" /> | ||
| + | *Install Wizard (accept most defaults) | ||
| + | *Command Line: Use Git Bash Only | ||
| + | *Choosing the SSH executable: Use (Tortoise)Plink | ||
| + | |||
| + | Download and install tortoisegit tortoisegit has the same look & feel as tortoisesvn<span id="fck_dom_range_temp_1332162837456_947" /> | ||
| + | |||
| + | *[http://code.google.com/p/tortoisegit/ http://code.google.com/p/tortoisegit/] | ||
| + | *[http://code.google.com/p/tortoisegit/ ] Install Wizard: | ||
| + | *Choose SSH Client: TortoisePLink, coming from Putty, integrates with Windows better, | ||
| + | |||
| + | <br><span id="fck_dom_range_temp_1332162893501_83" /> | ||
=== I've seen some issues with renaming things and how those things behave when other people update. Are there any gotchas? === | === I've seen some issues with renaming things and how those things behave when other people update. Are there any gotchas? === | ||
Revision as of 09:15, 19 March 2012
Contents
- 1 EclipseLink Development in Git
- 2 EclipseLink Git FAQ
- 2.1 How do I get started?
- 2.2 How does Git differ from SVN?
- 2.3 How do I work on two different tasks at the same time?
- 2.4 What do I do when I am working on a large task, and have to put it aside to complete a shorter task?
- 2.5 What is the difference between a git fetch, git pull and git clone?
- 2.6 When/how do I create branches?
- 2.7 After the server branches, how do I get the information to my local repo?
- 2.8 What tools do you recommend, what are their strengths and weaknesses?
- 2.9 I've seen some issues with renaming things and how those things behave when other people update. Are there any gotchas?
- 2.10 What is Git Rebase? When would I use it?
- 2.11 How do I verify that 'what I push to the repo is actually there'?
EclipseLink Development in Git
This page is for the Git usage portion of the dev process. It does not discuss issues with the build in Git, for more information on that please see: wiki.eclipse.org/EclipseLink/Build/Git .
This page is a work in progress, posing the questions that need to be answered. If you feel that you have more questions, please post them, if you can answer a question, please do.
EclipseLink Git FAQ
How do I get started?
How does Git differ from SVN?
How do patches in Git differ from in SVN?
How is merging different between Git and SVN
How do I work on two different tasks at the same time?
What do I do when I am working on a large task, and have to put it aside to complete a shorter task?
What is the difference between a git fetch, git pull and git clone?
When/how do I create branches?
After the server branches, how do I get the information to my local repo?
What tools do you recommend, what are their strengths and weaknesses?
Windows
For those currently using Tortise SVN with Windows, I would recommend using Tortoise Git.
Download and install the latest Git for Windows All the versions appear to be beta/preview, so just pick the latest.
] <span id="fck_dom_range_temp_1332162864861_298" />
- Install Wizard (accept most defaults)
- Command Line: Use Git Bash Only
- Choosing the SSH executable: Use (Tortoise)Plink
Download and install tortoisegit tortoisegit has the same look & feel as tortoisesvn<span id="fck_dom_range_temp_1332162837456_947" />
- http://code.google.com/p/tortoisegit/
- [1] Install Wizard:
- Choose SSH Client: TortoisePLink, coming from Putty, integrates with Windows better,
<span id="fck_dom_range_temp_1332162893501_83" />