how to merge to a local branch after checking out to a previous commit
===

My guess is this question has been asked and answered before but since I wasn't sure about the various terms in git so I post a fresh question:

I am working on a local branch(VISS). Then I decided to check out a previous commit:

> git checkout 98ea3c8042c39e

I made some important changes to the code. and then I committed again.
Now I need to go back to my branch (VISS) keeping these changes.
what should I do if I want to:
1-go back to my VISS branch discarding what was done before checking out to a previous commit(98ea3c8042c39e)

2-go back to my VISS branch merging the new changes with what I had done until top of the VISS (i hope my question is clear)

thank you
