Skip to main content

Troubleshooting

Dirty state on a non-WIP branch​

HighFlux handles all changes for you when you're on a HighFlux-controlled branch.

When you switch to a regular git branch, HighFlux won't do anything anymore, and you need to stage & commit changes you make there for them to get saved.

If there are unsaved changes on such a regular git branch, then HighFlux can't switch to a different WIP anymore, because then your unsaved changes would get lost. (Note that if you're on 'trunk' then HighFlux assumes you want to start a new WIP and takes your changes there. The 'dirty state' only applies to git branches that are not trunk).

When you're in this state, you need to resolve the open changes before HighFlux can switch to a WIP or create a new WIP again.

You have 3 options:

Option 1: commit your changes​

It could be that you made changes that you want to commit to the branch you're on. Use these git commands to make the branch 'clean' again:

git add .
git commit

Option 2: 'stash' your changes​

If you don't want to keep the changes but you still want to have them around for later use, you can stash them:

git add .
git stash

HighFlux will work and you can navigate to WIPs. If you want to apply the changes that you've stashed (e.g., after creating a new WIP for them), you can run:

git stash pop

Option 3: delete your open changes​

If the open changes are not important and can be deleted, then you can run the following to make the work tree clean again. NOTE: this will delete the changes and new files!

git reset --hard HEAD;
git clean -d -f

After choosing one of these options HighFlux should work as expected again.

Getting a git error after updating macOS ventura​

if you are experiencing an error after updating macOS, it may be because the Command Line Tools package has been removed or updated as part of the update process. This package is required by Git and other command-line tools, and without it, they may not function properly. To fix the problem, you can try reinstalling the Command Line Tools package.

You can do this by running the following command in the terminal:

xcode-select --install

This will prompt you to install the Command Line Tools package. Follow the on-screen instructions to complete the installation.

see: StackOverflow answer