Commit 77ec01b
fix(/update): rebase local commits onto origin/main instead of reset --hard
git reset --hard would destroy local customisations made by skills
(which modify and commit source files). git rebase origin/main
fast-forwards when there are no local changes, and replays skill-applied
commits on top of upstream updates when there are — preserving user
adaptations while still pulling core changes.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent 86f0c39 commit 77ec01b
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| |||
0 commit comments