Skip to content

Commit 77ec01b

Browse files
b1rdmaniaclaude
andcommitted
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

File tree

src/channels/telegram.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ export class TelegramChannel implements Channel {
8686

8787
try {
8888
execSync('git fetch origin', { cwd, encoding: 'utf-8' });
89-
const resetOut = execSync('git reset --hard origin/main', {
89+
const rebaseOut = execSync('git rebase origin/main', {
9090
cwd,
9191
encoding: 'utf-8',
9292
});
93-
await ctx.reply(`Updated: ${resetOut.trim()}`);
93+
await ctx.reply(`Updated: ${rebaseOut.trim()}`);
9494

9595
await ctx.reply('Building...');
9696
execSync('npm run build', { cwd, encoding: 'utf-8', timeout: 120_000 });

0 commit comments

Comments
 (0)