Commits from different machines cause conflicts in Git

Archive
,
5

Hi Alex Robin,

I follow the instruction from this page:

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

1 Like