# .gitignore file should include .cache/

**URL:** <https://forum.katalon.com/t/gitignore-file-should-include-cache/59146>\
**Category:** Bug Report\
**Tags:** tracked, katalon-studio, bugs-report\
**Created:** [October 13, 2021, 7:19am UTC](https://forum.katalon.com/t/gitignore-file-should-include-cache/59146 "2021-10-13T07:19:09Z")\
**Posts on this page:** 1\
**Showing post:** 9

<div class="post-metadata">

**Author:** ![kazurayam](https://dub1.discourse-cdn.com/katalon/user_avatar/forum.katalon.com/kazurayam/32/333_2.png) [@kazurayam](https://forum.katalon.com/u/kazurayam)\
**Post date:** [December 8, 2021, 2:21am UTC](https://forum.katalon.com/t/gitignore-file-should-include-cache/59146/9 "2021-12-08T02:21:50Z")

</div>

> [@gdearest07](#):
>
> ![image](https://europe1.discourse-cdn.com/katalon/original/3X/e/1/e10d04b46f63d02c0ba37a811bf975673a671e7b.png)

Duplicates with the years old post:

> [@Git Merge conflict com.kms.katalon.composer.testcase.properties](http://forum.katalon.com/t/git-merge-conflict-com-kms-katalon-composer-testcase-properties/22263):
>
> Ever since Katalon’s recent update to version 6.0.5 I can no longer merge our changes. We each have our own branch and will merge up into a master. However everytime a git merge is attempted we are now getting this error: Auto-merging settings/internal/com.kms.katalon.composer.testcase.properties CONFLICT (content): Merge conflict in settings/internal/com.kms.katalon.composer.testcase.properties I have no idea how to resolve this…

---

_[View the full topic](https://forum.katalon.com/t/gitignore-file-should-include-cache/59146)._