From f2ba9016fe633e031c16c688366a986453277ed3 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 18 Nov 2024 20:55:41 +0000 Subject: [PATCH 1/2] ignore .hugo_build.lock --- .gitignore | 1 + .hugo_build.lock | 0 2 files changed, 1 insertion(+) delete mode 100644 .hugo_build.lock diff --git a/.gitignore b/.gitignore index 69f8a8d..0e8de58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ public/ +.hugo_build.lock diff --git a/.hugo_build.lock b/.hugo_build.lock deleted file mode 100644 index e69de29..0000000 From ca54d4beb81c7bcc6ea9c3f64da6d33a50696212 Mon Sep 17 00:00:00 2001 From: revsuine Date: Mon, 18 Nov 2024 20:57:57 +0000 Subject: [PATCH 2/2] README clarify about branches --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index ada7c7a..d0c41be 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ These are the markdown files used to build [my website](https://revsuine.xyz/) w Lines have a character limit of 120 where possible. +# Theme Branches + +I have branches for each theme for the website. Commits to `master` should be theme-independent commits, e.g. new +posts. Theme branches should pull from `master` whenever there are new `master` commits. Commits exclusive to theme +branches should *only* be for changes relevant to the theme. + # Licensing The contents of this git repo are licensed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.txt). The contents of the