since I couldn’t find a discard on Mac from last video, and now I want to go back to snowman, it says I can’t witch the branch… it say “error: you need to resolve your current index first”
how do I do that?
Check my reply to your other post, hopefully that will help.
Take a look at the Uncommitted Changes section at the very top as that will be your pending edits/adds.
If you’ve changed a file that was already part of your existing branch/commit history, it doesn’t like having to swap that out for whatever is in the other branch you’re changing to, it will probably result in a conflict.
Completely new files that haven’t yet been added to the index / staged I don’t think it cares about for branch switches, so it’s just the files that already have ‘history’ in your git repo that should need resolving.
Once that’s done per my other thread and screenshot examples, you should be good to go for a branch switch then.
1 Like