Commit f3cb105
committed
Merge remote-tracking branch 'origin/main' into copilot/clean-up-repo-extra-files
Conflicts:
.eslintrc.json
.gitignore
Adam's_Hearty_Lentil_&_Vegetable_Soup.json
Adam's_Ultimate_Vegan_Grilled_Cheese.json
linuxarch101.md
sample_sessiondata.json
It looks like you may be committing a merge.
If this is not correct, please run
git update-ref -d MERGE_HEAD
and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch copilot/clean-up-repo-extra-files
Your branch is up to date with 'origin/copilot/clean-up-repo-extra-files'.
** All conflicts fixed but you are still merging.**
Changes to be committed:
modified: .agent/skills/dependency-auditor/test-project/package.json
modified: .claude/skills/dependency-auditor/test-project/package.json
modified: .codex/skills/dependency-auditor/test-project/package.json
modified: .cursor/skills/dependency-auditor/test-project/package.json
modified: .gemini/skills/dependency-auditor/test-project/package.json
modified: .github/dependabot.yml
modified: .github/skills/dependency-auditor/test-project/package.json
modified: .github/workflows/ci.yml
new file: .github/workflows/codeql-analysis.yml
modified: .github/workflows/daily-repo-status.lock.yml
modified: .github/workflows/dependabot-automerge.yml
new file: .github/workflows/dependency-review.yml
modified: .gitignore
modified: .zed/skills/dependency-auditor/test-project/package.json
modified: AGENTS.md
modified: Backend
modified: COPILOT.md
modified: QUICK_REFERENCE.md
modified: README.md
modified: START_HERE.md
modified: docs/cloud_build_tips.md
modified: docs/cloud_build_tipsFORMAT.md
modified: metadata.json
modified: package-lock.json
modified: package.json
modified: server/index.ts
modified: src/app.component.html
modified: src/app.component.ts
modified: src/services/auth.service.ts
modified: src/services/gemini.service.ts
modified: src/services/persistence.service.ts
modified: tsconfig.json
Untracked files:
.clawhub/
.eslintrc_BACKUP_1763037.json
.eslintrc_BASE_1763037.json
.eslintrc_LOCAL_1763037.json
.eslintrc_REMOTE_1763037.json
claude-code-tresor/
skills/
-- half way there,32 files changed
Lines changed: 2336 additions & 1985 deletions
File tree
- .agent/skills/dependency-auditor/test-project
- .claude/skills/dependency-auditor/test-project
- .codex/skills/dependency-auditor/test-project
- .cursor/skills/dependency-auditor/test-project
- .gemini/skills/dependency-auditor/test-project
- .github
- skills/dependency-auditor/test-project
- workflows
- .zed/skills/dependency-auditor/test-project
- docs
- server
- src
- services
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
16 | 23 | | |
17 | 24 | | |
18 | 25 | | |
| |||
25 | 32 | | |
26 | 33 | | |
27 | 34 | | |
28 | | - | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
29 | 74 | | |
30 | 75 | | |
31 | 76 | | |
| |||
38 | 83 | | |
39 | 84 | | |
40 | 85 | | |
41 | | - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
13 | 49 | | |
14 | 50 | | |
15 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments