Git Worktrees and Secret Management

Git Worktrees

git branch switch <branchname>

Create a new worktree for an existing branch at the specified path:
```
git worktree add <WORKTREE-PATH> <BRANCH>
```
Create a new branch and its worktree at the specified path:
```
git worktree add -b <BRANCH> <WORKTREE-PATH>
```

List all current worktrees, including the main worktree:
```
git worktree list
```
List worktrees in a machine-readable format:
```
git worktree list --porcelain
```

Lock a worktree to prevent it from being pruned:

git worktree lock [--reason <string>] <worktree>

Move a worktree to a new location:
```
git worktree move <worktree> <new-path>
```
Worktrees allow you to check out multiple branches simultaneously in separate directories, avoiding the need to constantly switch between branches or use git stash.

Identify the worktrees you want to merge: Determine which branches/worktrees you want to combine into a single branch. You can list all your current worktrees using the command git worktree list.
Checkout the target branch: Switch to the branch you want to merge the other worktree(s) into using git switch <target-branch>. This will be the branch that will contain the final merged changes.
Merge the worktree branches: Use the standard git merge command to incorporate the changes from the other worktree branches into the target branch. For example, to merge the feature-x branch into the main branch:
```
git switch main
git merge feature-x
```
This will merge the feature-x branch into the currently checked out main branch.
Resolve any conflicts: If there are any conflicts between the branches, Git will pause the merge process. You'll need to manually resolve the conflicts, stage the resolved files, and then continue the merge:
```
git merge --continue
```
Alternatively, you can abort the merge and start over if needed:
```
git merge --abort
```
Clean up the worktrees: Once the merge is complete, you can optionally delete the now-merged worktrees using git worktree remove <worktree-path>. This will remove the linked worktree directory while keeping the main repository intact.

Rewrite history:

git filter-repo --replace-text replacements.txt --replace-refs delete-no-add

Force push all changes to remote: