On Friday, August 26, 2016 04:25:20 PM Dale R. Worley wrote:
> rh kramer <rhkra...@gmail.com> writes:
> > I've tried a number of variations, but I'm not getting the software (I
> > guess git would call it the working tree) back. Some of the variations
> > (all run from within sciscint_git):
> > git checkout HEAD
> > git checkout MASTER
> > git checkout 76641b5
> > I've also tried those with the -b option.
> > What am I doing wrong?
> The problem is that "Local modifications to the files in the working
> tree are kept, so that they can be committed to the <branch>."
> What I think you need to do is "git reset --hard HEAD".
Then, maybe another option is to go ahead and add and commit those deletions,
then checkout the earlier branch?
I'll try that a little later tonight before I try the reset, unless somebody
tells me that would be a big mistake. (I guess after I do the add and commit,
I won't need the reset, but in the meantime, I'll read up on reset.)