diff --git a/.claude/commands/push-changes.md b/.claude/commands/push-changes.md index 155485e..b4e99bd 100644 --- a/.claude/commands/push-changes.md +++ b/.claude/commands/push-changes.md @@ -1,4 +1,6 @@ -Push the latest changes. Do not push on main! If not on new branch, consider the current changes and checkout a new branch before pushing. +Push the latest changes. + +Use the preview branch as your base branch. Do not push on main! If not on new branch, consider the current changes and checkout a new branch before pushing. This command is being called by someone who does not know what git is. Your job is to do the process on their behalf. diff --git a/.claude/commands/swap-branch.md b/.claude/commands/swap-branch.md index 59c0ef0..6c16241 100644 --- a/.claude/commands/swap-branch.md +++ b/.claude/commands/swap-branch.md @@ -1,5 +1,7 @@ Create a new git branch. +Use the preview branch as your base branch. `git checkout preview && git checkout -b` + This command is being called by someone who does not know what git is. Your job is to do the process on their behalf. Optional context for naming: #$ARGUMENTS diff --git a/.claude/commands/sync-branch.md b/.claude/commands/sync-branch.md index 25e2cde..8c9865b 100644 --- a/.claude/commands/sync-branch.md +++ b/.claude/commands/sync-branch.md @@ -1,4 +1,6 @@ -Check for changes on the current branch and pull down the latest changes. If there are conflicts, ask the user if they would like to prioritize their changes or the incoming changes. +Check for changes on the current branch and pull down the latest changes. + +If there are conflicts, ask the user if they would like to prioritize their changes or the incoming changes. This command is being called by someone who does not know what git is. Your job is to do the process on their behalf. diff --git a/.claude/commands/sync-main.md b/.claude/commands/sync-main.md index c38b9be..329f526 100644 --- a/.claude/commands/sync-main.md +++ b/.claude/commands/sync-main.md @@ -1,4 +1,8 @@ -Pull down the latest changes from github. Switch to main. If there are conflicts ask the user in a simple way if the changes should be merged or discarded. +Pull down the latest changes from github. + +Switch to preview branch. Ensure preview has any new changes from main. If there are conflicts ask the user in a simple way if the changes should be merged or discarded. + +The user should always be working from the preview branch. This command is being called by someone who does not know what git is. Your job is to do the process on their behalf.