Re: Making git as easy as CVS, for handling merge conflicts

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > I'll just say, for posterity, that avoiding staging is not difficult if
  > you have simple requirements.  A single command that creates a commit
  > containing all modified files without having to stage them first:

  >   git commit -a

  > You can also give a set of specific files to put into the commit, which
  > do not need to be staged first:

  >   git commit <file1> <file2> ...

That is what I did.  Sometimes it worked fine.  Sometimes it failed.

I can't remember for certain whether the failures occurred
on commit or on pull.  But I think they happened on pull
when there were othehr changes in the repo.

  >   Anyway, it doesn't seem that you're looking for
  > help with this.

I've learned that when people offer me help with git
it does not address the problem I actually encountered,
3 or 4 years ago.


-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)