Category Archives: Tools

Using Github in Eclipse Addendum

Leave a reply

Create a Repository in the Project Directory

  1. In the Package Explorer right click on the project name.
  2. Select Team->Share Project. The Configure Git Repository dialog is displayed.
  3. Check the box by Use or create repository in parent folder of project.
  4. In the selection area, click on the project folder. The name is duplicated in the box below.
  5. Click the Create Repository button.
  6. Click Finish. The repository shows in the list of the local repositories view.
  7. In the repositories view, select the repository just created. The unstaged project files are displayed in the Unstaged Changes view.

Configure Push Operation

  1. In repository view, right-click on the Remotes node.
  2. In the pop-up dialog window, click Create Remote. The New Remote dialog window is displayed.
  3. Accept the origin default value. Click OK.
  4. In the next dialog window, click the Change button.
  5. Enter the URL of the remote github location. The other values should be filled automatically.
  6. Click Finish.
  7. Click Save.

Merge Local and Remote Repositories

  1. In the Remotes node under origin, look for the green arrow pointing down, this is the Fetch arrow. Right click on the Fetch entry and select Configure Fetch in the popup window. You should see the URI, assure that it points to the remote repository.
  2. Look in the Ref mappings section of the popup. It might be empty. You must indicate which remote references you want to fetch. Click Add.
  3. Type in the branch name you need to fetch from the remote repository, usually master.
  4. Continue through the wizard.  Ignore the warning Remote tracking branch ‘refs/remotes/origin/master’ not found in local repository.
  5. Click Finish.
  6. In the last popup window, click Save and Fetch.  This will fetch the remote reference
  7. Click OK.

Look in the Branches folder of your local repository. You should now see the remote branch in the Remote Tracking folder. You should see something similar to the following:

  1. You should have a list of un-staged files. Stage all the project files but one (we need a second staging later to push all the committed files).
  2. Enter a comment such as “first commit”.
  3. Click the Commit. This puts the project under configuration control.  in the Local folder, you should see something similar to the following:
  4. Expand the Local folder of Branches, right click on the node named master.
  5. Select Merge. The Merge wizard is displayed.
  6. In the Merge wizard, under Remote Tracking folder, select the remote branch named origin/master.
  7. Click Merge.
  8. Follow the merge wizard steps.
  9. Now stage the remaining file. Add comment “first commit”.
  10. Click the Commit and Push
  11. Go through the Wizard steps.
  12. Click the Finish.
  13. Wait for the push operation to be configured and then click the OK button.

 

Using Github in Eclipse

Leave a reply

Using Github in Eclipse is the subject of this topic.  For more information about both tools, see version control system Git and Eclipse. The EGit plugin allows to use Git in the Eclipse IDE. The plugin is based on the JGit library which implements the Git functionality in Java. See also, Git version control with Eclipse (EGit).

Installing EGit in Eclipse

The EGit plugin can be installed into every Eclipse IDE installation. Usually EGit supports the last two Eclipse releases. Most Eclipse 4.2 (Juno) and Eclipse 4.3 (Kepler) downloads from Eclipse.org contain EGit in their default configuration. In this case no  installation is required. If the EGit plugin is missing in your Eclipse installation, you can install it via the Eclipse installation manager as described next.

  1. Start the manager via the Help → Install new Software menu entry. You can install EGit from the following URL: http://download.eclipse.org/egit/updates.
  2. Select Eclipse->Preferences->Team node.
  3. Click the Gift node and define the Git repository local path.
    Git Config
  4. Select Eclipse → Preferences →Team → Git → Configuration to see the current configuration and to change it.
    • In the configuration, among other things, you set the path to the .gitignore file, usually  /Users/<username>/.gitignore.
    • The file contains the list of files and/or artifacts  to ignore when publishing to github.  Tos see an exhaustive list of elements to ignore for various platforms, see github/gitignore.
  5. You can add entries to the Git configuration by clicking the Add Entries button on the Git Preferences page.
  6. To add the user, select the user.name as key and the name value.

Set Egit Views

It is helpful to set some Egit views as follows:

  1. Select Eclipse (Windows)->ShowViews-Other…–
  2. Expand the Git folder.
  3. Select Git Repositories and Git Staging.
  4. Click OK.
  5. Rearrange the views by moving the Git Repositories view at the bottom of the Project Explorer pane.

Create a Remote GitHub Repository

  1. Go to Github.
  2. Go to your repositories location. Click the Repository tab.
  3. Click the New button.
  4. In the Repository name box enter [your project name]. Notice this folder will contain the subfolder where the project files will reside. Potentially, you can add other sub folders containing files from other projects.
  5. Check the box by “Initialize this repository with a README“.
  6. Click the Create repository button.

Notice the URL of the repository, we’ll use it for synchronization with the local Github repository, which we are going to create now.

Create a Local GitHub Repository

The following steps show how to create a local GitHub repository for a project in Eclipse. These steps are equal to the get init command.

  1. In the Package Explorer right click on the project name just created.
  2. Select Team->Share Project. The Configure Git Repository dialog is displayed.
  3. Click the Create button.
  4. Select (create) the Repository Directory.
  5. Click the Finish button.
    It is recommended to separate your Git repository from any additional meta-data which Eclipse might create. Place your Git repositories outside the Eclipse work space. Placing Git repositories directly in the work space may cause performance issues since the Git support in Eclipse then may need to scan many of files reachable under the work space.

Upload Project Files to Github

This is a two steps process: first committing the files to upload, then actually pushing them to the Github remote repository.

Push Operation

Next we must push the project files to the remote Github repository, as follows:

  1. In the Package Explorer, right-click the project name.
  2. Select Team->Show in Repository View. The Git Repositories window is displayed.Git Repositories
  3. In this window, right-click on the Remotes node.
  4. In the pop-up dialog window, click Create Remote. The New Remote dialog window is displayed.
    Github New Remote
  5. Accept the default selections. Click OK. The Configure push for remote ‘origin’ dialog window is displayed.
  6. Click the Change button by the URI box. The Select a URI dialog window is displayed.
  7. In the URI box enter the remote http location of your Github repository. When using an HTTP address for the location, you must also enter your Github username and password for authentication purposes.
  8. Select the https Protocol.
  9. In the Authentication section, check Store in Secure Store.
  10. Click Finish.
  11. Click the Save button. Under the Remotes node the origin folder is created
    which contains the Fetch and Push entities.

Merge Remote Repository

To avoid issues between local and remote repository, you must assure they are in sync. A particular issue  Egit rejected non-fast-forward  is quite nasty. Here the steps to perform (Read this Stackoverflow answers, it really works).

  1. In the Remotes,node under origin, look for the green arrow pointing down, this is the Fetch arrow. Right click on the Fetch entry and select Configure Fetch in the popup window. You should see the URI, assure that it points to the remote repository.
  2. Look in the Ref mappings section of the popup. It might be empty. You must indicate which remote references you want to fetch. Click Add.
  3. Type in the branch name you need to fetch from the remote repository. Usually is master.
  4. Continue through the wizard.  Ignore the warning Remote tracking branch ‘refs/remotes/origin/master’ not found in local repository. Click the  Finish button.
  5. In the last popup window, click Save and Fetch.  This will fetch the remote reference
  6. Click OK.
  7. Look in the Branches folder of your local repository. You should now see the remote branch in the Remote Tracking folder. You should see something similar to the following:
  8. You should have a list of un-staged files, Stage all the project files but one (we need a second staging later to push all the committed files).
  9. Enter a comment such as “first commit”. Click the Commit button.This puts the project under configuration control.  in the Local folder, you should see something similar to the following:

  10. Expand the Local folder of Branches, right click on the node named master. Select Merge. 
  11. In the Remote Tracking folder, select the remote branch named origin/master.
  12. Click the  Merge button.
  13. Follow the merge wizard steps.
  14. Now stage the remaining file. Add comment “first commit”.
  15. Click the Commit and Push button.
  16. Go through the Wizard steps. You should see all the steps you did, similar to the following:
  17. Click the Finish button.
  18. Wait for the push operation to be configured and then click the OK button.
  19. Verify that your project files have been stored into the GitHub remote repository. 
  20. Go have a tasty beverage, congratulating yourself. Take the rest of the day off.
    You might want to see the following post in case you get a similar error: Egit rejected non-fast-forward.