Re: Help with git/wip

[coypu%sdf.org@localhost]

On Wed, Jul 26, 2017 at 01:23:38PM -0400, D'Arcy Cain wrote:
> When I ran that last command there were no changes except the ones that I
> wanted to commit.  So do I still have to do some git
> push/pull/stash/abra-cadabra command before the commit?  I can't even do a
> pull because I have those changes that I am trying to commit.  Doing any of
> those other commands being suggested just sends me on a circular path.
> 
> I still think that we need to move away from CVS but I think that I just
> moved back into the Subversion camp.

both cvs and git would consider the file modified in those
circumstances, git just won't auto-merge anything untracked, whereas cvs
will move away your local changes - stash by default, that is harder to
pop.