{"id":3086,"date":"2012-09-16T03:32:01","date_gmt":"2012-09-15T22:02:01","guid":{"rendered":"http:\/\/JitendraZaa.com\/blog\/?p=3086"},"modified":"2012-09-16T03:32:01","modified_gmt":"2012-09-15T22:02:01","slug":"salesforce-git-eclipse-egit-better-and-distributed-source-control","status":"publish","type":"post","link":"https:\/\/www.jitendrazaa.com\/blog\/salesforce\/salesforce-git-eclipse-egit-better-and-distributed-source-control\/","title":{"rendered":"Salesforce + Git + Eclipse + EGIT = Better and Distributed Source Control"},"content":{"rendered":"

During my J2EE and .Net days, I was much dependent on the subversion <\/a>repository. I had never thought my code without SVN. When I moved to Salesforce few years back, the first thing I missed is code repository to have better source code control. As svn creates either “.svn”\u009d or “_svn”\u009d folder, it was not supported by the force.com IDE and I struggled much to get it work out. Salesforce saves only real time information. So it is very difficult to know what was changed in past related to any issue as well as complete code backup.<\/p>\n

Era of Git<\/strong><\/p>\n

Git has emerged as the most powerful source code repository and widely accepted by the developer communities. If I will talk about Git this article is going to be out of discussion scope.<\/p>\n

\"Architecture<\/a>
Architecture of GIT<\/figcaption><\/figure>\n

Above figure describes Architect of Git. The one thing to notice in above figure is that Git has local repository as well as remote repository which make it better and more flexible than any other code repository tool.<\/p>\n

\"Remote<\/a>
Remote and Local Repository in GIT<\/figcaption><\/figure>\n

As you can see in above diagram also, user can work on completely different branch which is stored on his local repository and when he thinks that he is ready to push the code on Git, just commit the changes on remote repository.<\/p>\n

Step 1:<\/strong>
\nSo, let’s start with using Git with Salesforce using Eclipse plug-in EGit.<\/p>\n

EGit is an Eclipse Team provider for the distributed version control system Git. EGit allows performing Git commands from the Eclipse IDE.<\/p>\n

EGit is based on the JGit library. JGit is a library which implements the Git functionality in Java.
\nMost Eclipse 4.2 packages from Eclipse.org contain EGit in there default configuration. In this case no additional installation is required.<\/p>\n

If EGit is missing in your Eclipse installation, you can install it via the Eclipse Update Manager via: Help ?Install new Software. EGit can be installed from the following URL: http:\/\/download.eclipse.org\/egit\/updates<\/a><\/p>\n

Step 2:<\/strong>
\nGets the Salesforce code in local workspace using force.com IDE.<\/p>\n

Step 3:<\/strong>
\nNow, it is the time to configure repository on your local system which is also known as “Local Repository”\u009d. Navigate to “Right click on Project | Team | Share Project”\u009d<\/p>\n

\"Share<\/a>
Share Salesforce Project in Eclipse<\/figcaption><\/figure>\n

On the basis of your eclipse configuration, you will get options like CVS, Git, SVN etc. Select “Git”\u009d and click on Next button.<\/p>\n

Step 4:<\/strong>
\nClick on “create”\u009d button as shown in below image<\/p>\n

\"Configure<\/a>
Configure Git Repository in Eclipse<\/figcaption><\/figure>\n

A new pop up will open where we can give Local repository name as well as location where we want to save the local repository. In this article, I am using the name “GITDemo”\u009d name. Now click on Finish button.<\/p>\n

\"Non<\/a>
Non Indexed Local GIT Repository<\/figcaption><\/figure>\n

If you check the Salesforce project, the folder will look something like above image with questions marks (“?”\u009d) on folders. Question marks means Git does not know what to do with files, either you can schedule them for commit or add few of them in ignore list (means they will not saved in Git).<\/p>\n

Step 5:<\/strong>
\nNow we will commit our files and folder in Local repository. Before commit we have to mention that which files and folder should be committed and ignored. In this case I am adding complete salesforce directory for commit. To do this, write click on “Project | Team | Add to Index”\u009d. After this operation your icons should be something like below image:<\/p>\n

\"Indexed<\/a>
Indexed but Non Committed changes in GIT – Eclipse – Salesforce<\/figcaption><\/figure>\n

It’s time to commit all indexed files and folders in local repository. Again navigate to “Project | Team | Commit”\u009d. New Popup window will appear and ask for comment. It is mandatory to provide meaningful comment for each commit as it will be very easy for diagnosis in case needed in future.<\/p>\n

\"Commit<\/a>
Commit Changes to Git Repository – Eclipse – Salesforce<\/figcaption><\/figure>\n

After commit the folder structure will appear with following icons:<\/p>\n

\"Committed<\/a>
Committed folders in Salesforce Eclipse using Git<\/figcaption><\/figure>\n

Step 6:<\/strong>
\nUntil here, we have done configuration for Local repository. Let’s move on to create a remote repository. There are lots of options available for hosting your code which supports Git. Few of them are<\/p>\n

    \n
  1. GitHub<\/a><\/li>\n
  2. BitBucket<\/a><\/li>\n
  3. Unfuddle<\/a><\/li>\n<\/ol>\n

    Choice is up to us, which depends on license cost and many other factors. For demo, I am using the “BitBucket”\u009d.<\/p>\n

    Create a free new account at “BitBucket”\u009d and create a repository. After successful creation of Git repository you will get the URL for your repository. There will be two URL provided, https and SSH.
    \nFor this demo, I am using https URL. The URL format will be something like<\/p>\n

    https:\/\/YOURUSERNAME@bitbucket.org\/YOURUSERNAME\/YOUR_REPOSITORY_Name.git<\/p><\/blockquote>\n

    In Eclipse, at upper right corner, change the perspective to “Git Repository Exploring”\u009d as shown in below image.<\/p>\n

    \"Git<\/a>
    Git Repository Perspective in Eclipse<\/figcaption><\/figure>\n

    You will get the list of all Local Repository in this perspective. Now in Remotes, right click to create new Remote as shown in below image.<\/p>\n

    \"Create<\/a>
    Create Remote Git Repository Eclipse for Salesforce<\/figcaption><\/figure>\n

    One new popup will appear like below<\/p>\n

    \"Git<\/a>
    Git Create New Remote in Eclipse – Salesforce<\/figcaption><\/figure>\n

    First select the option “Push”\u009d and give name of remote repository Name. “Push”\u009d means you are going to save changes on remote repository and “Fetch”\u009d means you are going to fetch code from remote repository.
    \nWhen you will click on Ok button new window will open.<\/p>\n

    \"Configure<\/a>
    Configure Push for remote repository – Git – Eclipse – Salesforce<\/figcaption><\/figure>\n

    In new window click on “Change”\u009d (1) button as shown in above image. Again new pop up window will open. At location 2 provide your complete Git https URL. At location 3 provide your username and password. Don’t forget to check the box at location 4 which says “Store in Secure Store”\u009d. Now click on Finish Button.<\/p>\n

    \"Git<\/a>
    Git Ref Mappings – Eclipse – Salesforce<\/figcaption><\/figure>\n

    On Parent window click on Add (1) button. In new window, in Local branch text box and Remote branch enter “refs\/heads\/master”\u009d or you can press “Ctrl + Space Bar”\u009d.<\/p>\n

    After everything, click on “Dry-run”\u009d button to check, whether everything is properly configured or not? If everything is properly configured then it will show the repository name else it will show the error message.<\/p>\n

    Now click on “Save and Push”\u009d button to move changes from local repository to remote repository.<\/p>\n

    Question : Why I am getting an error something like “Git Push Failed , Non-fast forward updates were rejected<\/strong>“.<\/p>\n

    Solution :<\/strong> Mostly in my case, I am getting this error if you are trying to push something to remote server first time. Simplest way to resolve this error is to Fetch (Pull) first and then Push.<\/p>\n

    In the same way you can configure “fetch”\u009d to get the code from remote repository.<\/p>\n

    I hope it will be help full for learners. I am waiting for your feedback. In next article I will show how to connect using SSH instead of https protocol.<\/p>\n