From 71eecbc62131245a5400811901f5e4faea38373f Mon Sep 17 00:00:00 2001 From: Aaron Lampros Date: Fri, 8 Sep 2017 08:55:52 -0400 Subject: [PATCH 1/2] Add docs on .gitattribtues --- help/how-to.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/help/how-to.md b/help/how-to.md index dcd288d..6d20487 100644 --- a/help/how-to.md +++ b/help/how-to.md @@ -51,8 +51,11 @@ If your sketch files are already tracked in a git repository, there are few thin 1. Open your repo in Kactus to generate the JSON representation of your sketch files 2. Commit the generated JSON directories -2. Untrack sketch files. In most cases, this can be done with git by running: `git rm --cached *.sketch` -3. Tell git to [ignore](/help/glossary/#ignore) sketch files by adding `*.sketch` to your repo's `.gitignore` file (create it if it doesn't exist) +3. Untrack sketch files + - In most cases, this can be done with git by running: `git rm --cached *.sketch` +4. Tell git to [ignore](/help/glossary/#ignore) sketch files by adding `*.sketch` to your repo's `.gitignore` file + - This can be done from within Kactus ("Repository" > "Repository Settings" > "Ignored Files") +5. **IMPORTANT:** Add (or modify) your repository's `.gitattributes` file to include `* text=auto`. This helps git determine when files actually differ by normalizing line endings ([more details](https://git-scm.com/docs/gitattributes#_end_of_line_conversion)) > *Note:* When you create a new repository with Kactus, it is automatically configured to [ignore](/help/glossary/#ignore) sketch files. From 532a14a457070cb1cef920d38f077a09eb94cad5 Mon Sep 17 00:00:00 2001 From: Aaron Lampros Date: Fri, 8 Sep 2017 09:32:07 -0400 Subject: [PATCH 2/2] Revise existing repo docs --- help/how-to.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/help/how-to.md b/help/how-to.md index 6d20487..1d87293 100644 --- a/help/how-to.md +++ b/help/how-to.md @@ -55,7 +55,7 @@ If your sketch files are already tracked in a git repository, there are few thin - In most cases, this can be done with git by running: `git rm --cached *.sketch` 4. Tell git to [ignore](/help/glossary/#ignore) sketch files by adding `*.sketch` to your repo's `.gitignore` file - This can be done from within Kactus ("Repository" > "Repository Settings" > "Ignored Files") -5. **IMPORTANT:** Add (or modify) your repository's `.gitattributes` file to include `* text=auto`. This helps git determine when files actually differ by normalizing line endings ([more details](https://git-scm.com/docs/gitattributes#_end_of_line_conversion)) +5. Add (or modify) your repository's `.gitattributes` file to include `* text=auto` ([more details](https://git-scm.com/docs/gitattributes#_end_of_line_conversion)) -> *Note:* When you create a new repository with Kactus, it is automatically configured to [ignore](/help/glossary/#ignore) sketch files. +> *Note:* When you create a new repository with Kactus, it is preconfigured with these settings