Katalon git Pull Error

Product Forums Katalon Studio
,
7

The original post shows the following files having conficts.

settings/internal/com.kms.katalon.core.webservice.properties
settings/internal/com.kms.katalon.execution.properties
settings/internal/com.kms.katalon.integration.analytics.properties
settings/internal/com.kms.katalon.core.webservice.properties

@teguh.hariyadi

Let me assume you also have conflicts for the files under the <projectDir>/settings folder.

  1. The files under the <projectDir>/settings are created by Katalon Studio automatically. KS writes various information to record what you did on your PC with KS. Yes, you can safely delete them, but later KS will recreate them. You can not get rid of them.
  2. Let me assume Mr.A and Ms.B (the team) have KS and share a single project via a Git remote repository. They will find a similar list of files under the <projectDir>/settings on each of their PC. However, the content of these files are NOT identical, as Mr.A and Ms.B operated KS differently.
  3. The team has an option — whether they include the files under the <projectDir>/settings to be saved in the Git repository or not. It is completely up to them. Git and KS do not control it.
  4. If the team accidentally or ignorantly included the files under the <projectDir>/settings in the Git repository, they will inevitably experience conflicts detected by Git when they do “get fetch” + “git merge” or “git pull”, as they have files with same path but with difference content.
  5. Of course, the team would not want to be annoyed by conflicts caused by the files which are automatically updated by KS. Those files are not suitable for sharing via Git repository. So, the team should remove the files out of the repository (do not share them), and should ignore them (= do not saved them in the repository) any longer.
  6. You can instruct Git to ignore files under the settings/ folder when you do git add .. You can write in the .gitignore file:
settings/
  1. You can find a discussion how we should write .gitignore file at .gitignore template for Katalon Studio
  2. If you have a fews files under the settings/* folder already saved in the Git repository, changing the .gitignore file is not enough. You need to remove the files out of the index (= the list of file paths to be saved) in the repository by executing:
$ cd <to your project>
$ git rm -r --cached settings/

See also my previous post at .gitignore is ignored - content in ignored directories is still included in commits .

1 Like