Can't Return to Main branch in Git Manager

[GraybeardCoder]

Branching is great, Wappler's Git Manager causes headaches. I followed the how to's on a test project to get more familiar with Git manager, but even that presented some interesting results. Now I find myself in a situation I can't resolve on my main project: returning to the main branch. I'm receiving the following error when I try to select Main from Git manager's dropdown of branches:

There is no .DS_Store at this location and yes I have hidden files turned on in Mac's Finder. This is what my Git manager looks like, a big mess:

I can't reset or revert to any commit successfully. I've now installed github desktop, but would like to resolve this issue within Wappler.

[George]

Is the .DS_Store not included in your .gitignore file? Should be by default. Note .gitignore file is hidden

[GraybeardCoder]

within my .gitignore for the project:

node_modules
.svn
.env
**/.DS_Store

[George]

@GraybeardCoder

There is no .DS_Store file under .wappler/migrations

Well Trayvon’s fine the one in the main folder will be used and the ** means in any subfolders.

So it should be fine.

Maybe the one under migrations is somehow committed, so you can try to delete it

[GraybeardCoder]

To make sure I'm understanding you correctly...

Are you saying that the .DS_Store file might have been in a commit to github and I should look through my commits for this file?

If I find it in a commit, then delete it?

Looking at the files within the migrations directory, it does appear that .DS_Store exists, but it certainly is not a directory.

[GraybeardCoder]

Ok, me and my lack of Mac knowledge. Good thing the underlying OS is linux based. I deleted the .DS_Store "file" from within migrations and was able to switch back to main within Git Manager. Thank you again George for your guidance and patience.