Skip to Content

I wanted to revisit the basic use of Git because there have been several changes in the last six months to make it easier to use, as well as changes in the SAP Cloud Platform.

I’m glad the topic is getting some exposure — thanks to Kiran for her recent blog on the topic, especially a view in the SAP Cloud Platform cockpit showing how to create a new version of an application from a specific commit. Still, there are a few additional things to show, including multi-developer scenario.

Want to watch?

Below I will spell out the steps, but here’s a fresh 3-minute video that shows the complete steps for starting working with Git in a multi-developer scenario.

How to work with Git

Developer 1

Here’s the workflow for the first developer (with tips along the way).

  1. Create a Git repository. This can be in Github or in a Git system in your company. For our example, we create a Git repository in the SAP Cloud Platform.
    Creating a Git repository in SAP Cloud Platform is now simpler. You no longer have to create an application to get a Git repository, nor from SAP Web IDE do you have to create a project and deploy it. In SAP Cloud Platform, just go to the cockpit and select Repositories Git Repositories, and create one by clicking New Repository. Click on your new repository and get the clone URL for later.
  2. Create a project. In SAP Web IDE, create a project, for example, from a template.
  3. Initialize a local repository. Make your project a local Git repository by right-clicking the project in the workspace, and selecting Git Initialize Local Repository.
  4. Set remote repository. Here’s where you connect your local repository in Step 3 to the remote repository you created in Step 1. Click on Set Remote, either in the notification you get after initializing, or in the Git menu. 
  5. Rebase. Get the latest commits.
    If you don’t rebase, you’ll have trouble pushing later. A common problem I had was that on my first commit I could not push (the dreaded FAST FORWARD error), even though I knew my repository was empty. But in fact the repository has an automatic first commit, and you need to retrieve it. (When you create the Git repository in SAP Cloud Platform, you are asked if you want a first commit — it’s on by default.)
  6. Stage, commit, and push.
    I often forget to add a commit message and then wonder why the Commit button is disabled.

Developer 2

Now a second developer is interested in working on the project.

  1. Clone the repository. Get the clone URL from the first developer, and go Clone Git Clone Repository. The clone dialog is much simpler, and now you only need a clone URL. You can also select whether your repository works with Gerrit for code checking. More on Gerrit in another blog.
  2. Code. Make changes to the project as necessary.
  3. Stage, commit, and push.

Developer 1

Back to the first developer, who wants to get the latest changes.

  1. Fetch. Fetching brings back information about the remote repository — like what branches there are and what commits you are missing — but it does not update your project in the SAP Web IDE.
  2. Rebase. Rebasing updates your project with all the changes in the remote repository made by other developers (and that you already brought back with the Fetch command).

That’s it. In upcoming blogs, we’ll go through what happens when there are conflicts, and how to use Gerrit for code review and collaboration.

 

To report this post you need to login first.

24 Comments

You must be Logged on to comment or reply to a post.

  1. Ram Ganti

    Hi Daniel,

    Thank you for your post. Its helpful.

     

    I have two trail accounts. In one trail account, I have created GIT repository and stored sample project created in that account.

    I tried to clone  the same repository in other trial account, I got error as “Service not enabled”.

    Please can you help me to understand the issue.

    (0) 
    1. Daniel Wroblewski Post author

      There is no supported use case where a user from one account will get access to a repository in another account. The use case I described was with 2 developers in the same account. You could of course use Github, but you essentially have the same issue — you need to create an account in Github.

      (0) 
      1. Abdel DADOUCHE

         

        Hi @Ram Ganti & @Daniel Wroblewski,

         

        This is actually feasible on trial as well.

         

        In the past you use to have a dialog where you could enter your credentials, but in a trial scenario I wasn’t making sense as you would only use your GIT.

         

        So the dialog is now simplified with just the remote source url only.

         

        So to connect to a remote account GIT on trial, you will need to adjust the repository url and include the remote user id in it like this:

        https://<remote scp user id>@git.hanatrial.ondemand.com/<remote scp user id>/<remote scp git repo name>

         

        Then you should get prompted for the password for <remote scp user id>. Make sure you check “Remember password”.

         

        Hope this helps.

         

        @bdel

        (0) 
        1. Ezequiel A

          Abdel.

           

          This is exactly what i’m looking for.

           

          I tried your suggestion, but when i Input the password for  <remote scp user id>, it does’nt work. It says “Not authorized”…

          Just to clarify, the password im putting is the pasword for the <remote scp user id> user, the one i use to login to SAP HCP.  

          Is there something i’m missing?

           

          Thanks!

          Ez

          (0) 
          1. Abdel DADOUCHE

            Hi,

             

            Let’s say I’m user A with my Git repo name myrepo I want to share with you, let’s call you user B.

             

            So, from a WebIDE session under user B credentials, I would enter:

            https://userA@git.hanatrial.ondemand.com/userA/myrepo

            Then I will have to enter user A password when prompted.

             

            It was working when I wrote the response, but I haven’t tested it since then to be honest.

             

            @bdel

            (0) 
            1. Ezequiel A

              Thank you very much for your answer!

              Yes, that’s exactly what i’m doing, but i get the “Not Authorized” message…

              May be it’s not working anymore?

              If it’s not much asking.. when you have a minute could you try if it’s working now? Just to discard that it’s me doing something wrong.

              Ez.

              (0) 
            2. SAMARASIMHA REDDY

              HI ,

              Is it possible to get Git Repository files and content ? other application ? we need any API support here ?

              i will tell you my case:

              i have one input files and button . in the input filed i give hcp git url  like https://git.hanatrial.ondemand.com/p1xxxxx/fioridemo.

              after clicking submit button i need to get the “fioridemo” files and content in table .

              i get succeed using github.com to get the user repository  files and content by using https://api.github.com/ API file.

               

              is there any API file to get the HCP Git repository ?

               

              please suggest me on this.:)

               

              Regards,
              Sam

               

              (0) 
        2. Daniel Wroblewski Post author

          OK, I thought you meant you had one user who had access to 2 SCP accounts. So in essence you have simply set up 2 trial accounts (with 2 different users) and do not grant permissions across accounts. Right?

          (0) 
          1. Abdel DADOUCHE

            yes, 2 trial accounts (with 2 different users). Then from one setup the GIT, and on the second use the first one credentials as mentioned earlier.

             

            Let me know if it worked for you.

            (0) 
  2. SAMARASIMHA REDDY

    HI ,

    Is it possible to get Git Repository files and content ? other application ? we need any API support here ?

    i will tell you my case:

    i have one input files and button . in the input filed i give hcp git url  like https://git.hanatrial.ondemand.com/p1xxxxx/fioridemo.

    after clicking submit button i need to get the “fioridemo” files and content in table .

    i get succeed using github.com to get the user repository  files and content by using https://api.github.com/ API file.

     

    is there any API file to get the HCP Git repository ?

     

    please suggest me on this.:)

     

    Regards,
    Sam

     

    (0) 
      1. Sam Reddy

        Hi,

        Thanks for the return.

         

        i’m also facing same issue with HCP Git , @Daniel Wrobleski or anyone can help here .

        i’m able to get repositories from Github actually.

        Regards,
        Sam

        (0) 
  3. Ho Quoc Vuong

    Hello,

    When I pull remote repository to my local branch in SAP Web Ide, I’ve got this problem with GIT:

    3:13:49 PM (git) Pull request failed No merge base could be determined. Reason=CONFLICTS_DURING_MERGE_BASE_CALCULATION. "More than 200 merge bases for:
    a ac84124fd128aa579db65693b36be11b5d9a3575
    b 1b9e27eb78bed7f9ec40517fee32dfb0a5504ef7 found:
    count 2"

    I’ve searched but found no solution, the only solution is mentioned here.

    They suggest to update the git version to higher version, but it seems unable to do so in sap web IDE. The Web IDE also does not support git command line so there’s no solution to get over this bug.

    Could you please support this case?

    Thanks a lot!

    Victor.

    (0) 
      1. Ho Quoc Vuong

        Hi Daniel,

        The git system has fixed the problem.

        After getting the error, I’ve tried to Fetch then Rebase but I didn’t work.

        After sometimes, Git system has fixed the error (I’m not sure how) by merging all the changes into one commit. I’ve searched the Internet and the community mentioned that this is a bug from Git.

        I hope we won’t encounter this bug in the future.

        Thank you!

        Victor

        (1) 
  4. Diana Martinsone

    Hi, when I try to clone the Git repository to my workspace from HCP, all I get is gitignore file. WebIDE console gives error (CloneandOpen) Path parameter not found. I cannot find any solution or description of the similar problem anywhere, do you have any idea why cloning git is not working for me?

    (0) 

Leave a Reply