# Commits from different machines cause conflicts in Git

**URL:** <https://forum.katalon.com/t/commits-from-different-machines-cause-conflicts-in-git/9060>\
**Category:** Integrations\
**Tags:** integrations, katalon-studio\
**Created:** [August 4, 2017, 7:00am UTC](https://forum.katalon.com/t/commits-from-different-machines-cause-conflicts-in-git/9060 "2017-08-04T07:00:52Z")\
**Posts on this page:** 1\
**Showing post:** 5

<div class="post-metadata">

**Author:** ![Oliver\_Howard](https://avatars.discourse-cdn.com/v4/letter/o/22d042/32.png) [@Oliver\_Howard](https://forum.katalon.com/u/Oliver_Howard)\
**Post date:** [August 10, 2017, 1:58pm UTC](https://forum.katalon.com/t/commits-from-different-machines-cause-conflicts-in-git/9060/5 "2017-08-10T13:58:17Z")

</div>

Hi Alex Robin,

I follow the instruction from this page:

> <https://stackoverflow.com/questions/16244969/how-to-tell-git-to-ignore-individual-lines-i-e-gitignore-for-specific-lines-of>

1. Create/Open gitattributes file:  
/.gitattributes (will be committed into repo)  
OR  
/.git/info/attributes (won’t be committed into repo)

2. Add a line defining the files to be filtered:  
\*.ts filter=gitignore, i.e. run filter named gitignore on all \*.rb files  
Define the gitignore filter in your gitconfig:

3. After the final step, your gitignore filter will look like:  
$ git config --global filter.gitignore.clean "sed ‘//g’ ", i.e. delete these lines  
$ git config --global filter.gitignore.smudge cat, i.e. do nothing when pulling file from repo

Thanks

\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_  
Thank you for choosing Katalon Studio as your automation solution.  
Your feedback is needed to make Katalon Studio a better tool, take the survey at: [https://goo.gl/S25NVO](https://goo.gl/S25NVO)

---

_[View the full topic](https://forum.katalon.com/t/commits-from-different-machines-cause-conflicts-in-git/9060)._