naps62/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Miguel Palhas
2025-11-25 11:05:30 +00:00
parent 8e1025a3c1
commit 38dff7bfeb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/common/programs/claude/commands/merge.md
+2 -1
View File
@@ -1,7 +1,8 @@
Merge a branch from the worktree.
If you're currently working on a worktree, assume that's the one I'm referring to.
Start by merging back the new main branch, since I may have made changes to it.
Start by committing any staged and unstaged changes. I may have made changes to the worktree manually.
Then merge back the new main branch, since I may have made changes to it.
# Language specific: