From 67446feb6fa8a2bfcda42955254ce6f9a8c83a23 Mon Sep 17 00:00:00 2001 From: Mathieu CAROFF Date: Sun, 8 Sep 2019 12:39:50 +0200 Subject: [PATCH 1/3] Provide instructions to ignore file in README --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 23cc7e5..79a76f0 100644 --- a/README.md +++ b/README.md @@ -282,3 +282,17 @@ gulp dev --coverage # run with tests and code coverage - `src/ts/server/start.ts:35` - adding custom map to the world - `src/ts/server/map/customMap.ts` - commented introduction to customizing maps + +## Have git ignore changes to `sprites.ts`, eventhough it's already in the index + +```bash +git update-index --assume-unchanged src/ts/generated/sprites.ts +``` + +`serve.ts`: + +```bash +git update-index --assume-unchanged src/ts/server/server.ts +``` + +Read more about it [here](https://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository). From b4f224f5dabfc2b574ba27d508b402573034d79a Mon Sep 17 00:00:00 2001 From: Mathieu CAROFF Date: Sun, 8 Sep 2019 19:19:39 +0200 Subject: [PATCH 2/3] Simplify the section about ignoring file in index --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 79a76f0..a0c761d 100644 --- a/README.md +++ b/README.md @@ -289,10 +289,4 @@ gulp dev --coverage # run with tests and code coverage git update-index --assume-unchanged src/ts/generated/sprites.ts ``` -`serve.ts`: - -```bash -git update-index --assume-unchanged src/ts/server/server.ts -``` - Read more about it [here](https://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository). From 309eeb207ea0b3e210e62818566b3c2176def3a6 Mon Sep 17 00:00:00 2001 From: Eliot Partridge Date: Mon, 9 Sep 2019 22:48:52 +0200 Subject: [PATCH 3/3] Add `sprites.ts` ignore explanation Content provided by Eliot Partridge: https://github.com/ponydevs/pixel.horse/pull/91#issuecomment-529270365 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a0c761d..7ca8560 100644 --- a/README.md +++ b/README.md @@ -285,6 +285,8 @@ gulp dev --coverage # run with tests and code coverage ## Have git ignore changes to `sprites.ts`, eventhough it's already in the index +Due to an issue with the build system, an old copy of `src/ts/generated/sprites.ts` is shipped with this repository. In order to prevent Git from seeing changes to this file from local builds and warning you about them when changing branches or pulling new changes, you can use the following command: + ```bash git update-index --assume-unchanged src/ts/generated/sprites.ts ```