How to resolve conflicts while pull the code from git through katalon

Product Forums Katalon Studio
,
1

Hi,

Can anyone please help how to resolve the conflicts when pull the code from github.

DIRTY_WORKTREE .classpath

How to Resolve Conflicts Dirty_WorkTree in git repository.

image
image1235×215 3.06 KB

3

  1. Please share your .gitignore file.

  2. And tell us if you work on Windows, Mac or Linux.

  3. Can you execute git command in console?

4

image
-Windows machine
-no
I’m getting this one
image

5

You should add the following line into the .gitignore file.

.cache

This means that you do not want to store any of files under the .cache to be stored into the git repository.

And you want to execute the following command:

$ cd <project directory>
$ git rm --cache .cache

This removes the .cache directory and its content files out of the INDEX of the git repository. You need to do this as the message tells the .cache directory in the repository is dirty. Once you remve the .cache out of the INDEX, you would no longer see the message “DIRTY_WORKTREE .cache/subpath”.

Rational: The .cache directory contains the .class files of custom keywords. If any .class file is missing from the .cache directory, Katalon Studio will compile the .groovy source of Keyword and generate the .class file. Therefore it is safe and rather recommended for you to ignore the .cache directory completely.

6

Katalon Studio can generate the .gitignore file when you newly create a project. The default content of the generated .gitignore does NOT include a line .cache. I believe it is a fault. The .gitignore without .cache makes many users confused (including you @vpatil). Years ago I wrote a post about this issue, but they have not addressed this problem.

@vu.tran

Are you aware of this disregarded issue?