Error Occured While Uploading in Tfs the Link Is Locked for Checkout by Someone Else

Git Integration

Git is an essential arrangement for version control. Suppose your Katalon Studio automation projection involves several or more members. In that case, you should use Git or another source command organisation for managing change and configuration on your test project. You can share a Git repository across multiple squad members to help meliorate the squad'due south collaboration and productivity.

About Git Integration

The Git integration supported in Katalon Studio is based on EGit. For detailed teaching, you can refer to the Eclipse Foundation document on EGit/User Guide. A typical workflow of Git integration with Katalon Studio is depicted in the following diagram:

You can integrate Katalon Studio with Git and its cloud-hosted services, including:

• GitHub
• GitLab
• BitBucket
• Microsoft Azure DevOps

Configure Git Integration

1. Enable Git Integration: To access all Git features, you need to enable Git Integration showtime. The selection is available in the following settings: Katalon Studio > Preferences > Katalon > Git. One time enabled, you can first using Git at Katalon Studio'due south primary toolbar.

   

2. At present, the Git integration feature should be enabled. Nosotros are prepare to use Git from Katalon Studio.

   

3. Advanced configurations are available at Katalon Studio > Preferences > Squad > Git if you want specific settings.

   

Clone a Katalon Studio project from a Git repository

Subsequently enabling Git Integration, you can clone an existing Git repository into a newly-created directory on the local machine.

1. In the master toolbar, click on the Git icon and select Clone Project.

   

2. The Clone Git Repository dialog is displayed.

Connect to Git with HTTPS

To let Katalon Studio get details well-nigh your repository, enter all required information and click Next.

How to get HTTPS Protocol?

Become to your business relationship on GitHub, GitLab, Bitbucket, or AzureDevOps, then go to the repository you want to clone to Katalon Studio. Click Clone and select HTTPS, so re-create the HTTPS Protocol.

• Repository URL: the remote URL to your Git repository in HTTPS protocol. See Git documentation: Nigh remote repositories.
• Authentication:
  • Username: the username to admission the Git repository.
  • Password: the countersign to access the Git repository.

Notes:

• To clone your repository from Azure DevOps, you need to click Generate Git Credential.
• Copy the Username and the generated Password, then paste them accordingly in the Hallmark section in Katalon Studio.

If you lot cannot admission the repository subsequently clicking Next, the connexion might have issues with SSL verification. Yous can utilise the command below to bypass SSL verification (Not recommended):

                              git                config                --                global                http                .                sslVerify                false                          

Connect to Git with SSH Keys

Known problems:

• Currently, the Git integration in Katalon Studio supports SSH SHA-1, RSA-1024 and RSA-2048 individual keys. Since GitHub has dropped the support for DSA and RSA SHA-1, you cannot integrate Katalon Studio with GitHub via SSH. You lot can nonetheless integrate Katalon Studio with other deject-hosted services of Git, such as GitLab, BitBucket, and Microsoft Azure DevOps.

• The workaround for this issue is to apply:

  • HTTPS protocol with GitHub personal access token. See Connect to Git with HTTPS.
  • Git with a terminal.
  • third party tools.

To connect to Git with SSH keys, see Git Integration Authentication with SSH Keys.

Publish a local non-Git projection as a Git repository

Share Projection is a step to enable Git configuration for your new Katalon Studio project.

1. In the main toolbar, click the Git icon > Share Project.

   

2. Folder .git and file .gitignore are created within the Katalon project.

   .gitignore tells Git which files (or patterns) it should ignore. By default, .gitignore contains these files and patterns:

   /bin /Libs .settings .classpath /.svn

Commit

The Commit selection allows users to view all current changes and decide which changes are stored in the local co-operative. For more information on the commit control, refer to this Git document: Commit.

1. In the main toolbar, click the Git icon > Commit.

   

2. The Git Staging tab is displayed for configuration.

   

   Field	Description
   Unstaged Changes	Changes which accept been made.
   Staged Changes	Selected changes from Unstaged Changes. These changes are committed.

3. From the Unstaged Changes listing, select the changes to be committed, then right-click on them and select Add To Alphabetize. Selected changes are added to the Staged Changes listing.

4. Enter your comments into the Commit Bulletin, then click on Commit to shop your staged changes into the local branch.

Manage Branches

New Branch

1. In the principal toolbar, click the Git icon > Manage Branches > New Branch.

   

2. The Create Co-operative dialog displays.

   

   Field	Clarification
   Source	Select either remote or local co-operative, which is your source branch.
   Co-operative name	The proper name to be used for the new branch.
   Checkout new branch	Choice to let Katalon Studio checkout that branch after created.

3. Click Terminate to create a new branch.

Checkout Branch

The Checkout Co-operative option allows you to switch from one co-operative to another.

1. In the main toolbar, click the Git icon > Manage Branches > Checkout Branch.

   

2. The Select Source dialog displays. Select the local branch yous want to check out to be the current branch. The branch with an √ icon is your electric current local co-operative.

   

3. Click OK to end checking out to the new local branch.

Delete Co-operative

1. In the principal toolbar, click the Git icon > Manage Branches > Delete Co-operative.

   

2. In this dialog, both local and remote branches are displayed. Select a branch to exist deleted, then click OK.

   

Fetch

Retrieve all information about changes that have occurred in remote branches. For more data on the fetch command, refer to the Git documentation: Git Fetch.

1. In the primary toolbar, click the Git icon > Fetch.

   

2. Remote branches, tags, and remote changes are fetched automatically.

   

3. In the primary toolbar, click History.

   

4. Details regarding all the branches and tags you've just fetched are displayed.

   

Pull

Incorporate changes from a remote repository into the current branch. For more than data on the pull command, refer to the Git documentation: Git Pull.

1. In the primary toolbar, click the Git icon > Pull. The Pull dialog appears.

   

2. In the Pull dialog, select the remote co-operative to be pulled into your local branch. Click Finish.

   

3. The Pull Issue dialog displays all data about pulling requests on the selected branch.

   

Button

Update the remote branch using the local branch. For more information on the push button command, refer to the Git documentation: Git Push.

Before doing any push, you have to commit your changes first.

1. From the master toolbar, select the Git icon > Push.

   

2. The Push to Branch dialog is displayed. Cull from the Remote co-operative list which branch to exist updated (All remote branches in your Git repository are listed hither).

   

   Click Side by side after finishing selecting your remote branch. The Push Confirmation dialog appears.

   Notes: If you enter a unlike name besides the listed branches, a new remote co-operative with that proper noun is created accordingly.

3. The Push Confirmation dialog displays details regarding your commit.

   

   Click on End to push your commits to the remote repository.

Resolve Git conflicts using Katalon Studio

Why do we take Git conflicts?

• In a source control system like Git, conflicts occur when 2 or more people brand changes to the same file concurrently. The conflicts may appear at a fellow member's local repository or Git remote repository.

• To avoid conflicts, the team must collaborate following several Git practices. For instance, before pushing new source lawmaking to the Git remote repository, one must remember to fetch the latest version from Git remote repository, resolve whatsoever conflicts, and merge the code with the local version.

An instance of how to resolve Git conflicts using Katalon Studio

• The nautical chart below demonstrates how conflicts may occur when Tom and Emma are working on the same project. The conflicts occur when Tom and Emma endeavor to push new code to the Git remote repository without updating the changes from each other.

  

Given situation:

• Tom and Emma are working on the same test case in a examination project. Emma added a new annotate ("EMMA ADDED THIS Annotate"), so committed and pushed the change to the Git remote repository.

  

• At near the same time, Tom added a new comment ("TOM ADDED THIS COMMENT"), then committed and tried to push to the Git remote repository.

  

• Unfortunately, since Emma had pushed the lawmaking before Tom, so the version of code in Git was different from the version of code in Tom's local repository. Therefore, Git rejected Tom's push action.

Question: What should Tom exercise to button its alter to the Git remote control?

• First, Tom has to pull the code from the Git remote repository to his local machine.

  

• Apparently, Tom will run across a message about the conflict:

  

• In the Script mode of the test case TC2_Verify Successful Engagement in Tom'south Katalon Studio projection, at that place are errors with indicators such as "<<<<<<<" (convention from Git). Let's wait at the script more carefully:

  

• Recall that the comments were added past Tom and Emma, and the conflict is now on Tom'southward Katalon Studio project. Everything within "<<<<<<< HEAD" and "=======" is the change from Tom. And, everything within "=======" and ">>>>>>> branch 'master'…" comes from Emma, which is currently in the Git remote repository.

• Now Tom has to decide which change is correct, or both are correct or wrong. Tom has to supervene upon these lines of code with the correct ones. For example, "THIS IS THE Correct COMMENT":

  

• Afterward resolving the conflict, Tom is now able to commit and push the change to the Git remote repository.

Best practices

To minimize the conflict in a team having more i member, you should define a process from the very beginning so that all squad members are on the aforementioned page when using Git.

Beneath are some suggestions for good practices:

• Commit oft: do not await until many scripts are created to commit and push to the Git remote repository. The smaller the prepare of scripts is pushed, the easier y'all resolve the conflict.
• Pull changes from the Git remote repository earlier working on new scripts and earlier committing. Each member works on each feature at a time.

Feedback

• Edit this page
• Request docs changes

danielssairing.blogspot.com

Source: https://docs.katalon.com/katalon-studio/docs/git-integration.html

Share this post