Skip to content

Commit 47c853a

Browse files
committed
removing dist from gitignore and updating readme
1 parent 3c1e119 commit 47c853a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ package-lock.json
2323
!.vscode/tasks.json
2424

2525
# Misc
26-
_sass/dist
27-
assets/js/dist
2826
_app
2927

3028
# Link Checker

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Chirpy:
5656

5757
## Upgrading the Theme
5858

59-
Since we aren't using the theme gem (so we can do customizations), we have to do it the old-fashioned way:
59+
Since we aren't using the theme gem (so we can do customizations), we have to do it the old-fashioned way:
6060

6161
1. Ensure chirpy is set as a remote: `git remote add chirpy https://github.com/cotes2020/jekyll-theme-chirpy.git`
6262
2. Ensure you have the latest upstream commit: `git fetch chirpy`
@@ -69,16 +69,17 @@ Since we aren't using the theme gem (so we can do customizations), we have to do
6969
- If getting GPG errors, modify the local git config: `git config commit.gpgsign false`, but modify it back to `true` after you are done cherry-picking and rebasing (before amending commit)
7070
5. Review merge conflicts - use a combination of `git cherry-pick --skip` (for when readme/starter posts are updated) and `cherry-pick --continue` (to continue after you resolve real merge conflicts)
7171
6. Starting in Chirpy v5.6.0, run: `npm run build && git add assets/js/dist _sass/dist -f && git commit -m "update js assets"` ([docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide#upgrade-the-fork))
72+
- You can also run a command that's referenced in the `init.sh` to remove this from `.gitignore`: `sed -i '' "/.*\/dist$/d" .gitignore`
7273
7. Rebase the number of commits you just brought in (you should see icon in VS Code): `git rebase -i HEAD~16`
7374
- Leave the top commit as `pick` but change the rest to `squash`
7475
- Update the commit message as appropriate
7576
8. Pay close attention to the terminal output as to which new files are being created and if they should be deleted (new files show up as `create mode 100644 file.ext`)
7677
- For example, we wouldn't want to commit a GitHub workflow or issue template that wasn't needed here
7778
- If there are new files that we don't want to track, delete the files, commit, and run another rebase `git rebase -i HEAD~2`
7879
- This command can help with tracking new files in the most recent commit: `git diff-tree --compact-summary -r HEAD --diff-filter=A`
79-
9. Ensure commit signing is enabled: `git config commit.gpgsign true`
80+
9. Ensure commit signing is enabled: `git config commit.gpgsign true`
8081
10. Update author and commit time: `git commit --amend --author "Josh Johanning <joshjohanning@github.com>" --date=now -S`
81-
11. [Test changes locally before pushing](#building--testing-locally)
82+
11. [Test changes locally before pushing](#building--testing-locally)
8283

8384
## Building / Testing Locally
8485

0 commit comments

Comments
 (0)