[[[ 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. ]]]
> A wild guess, based on previous conversation in this thread, is that > maybe you resolved the conflict in emacs but didn't stage the > resolution before attempting to commit it. Standard VC workflow does not include anything called "staging". The instructions I got did not include it either. I am sure someone sent me instructions for "staging". For some reason, it was too hard to do, and I gave up on it. I don't remember details. > git has been handling merges extremely well for many years now. I > believe this is one of the main reasons it is now used by tens of > millions of developers. If you are soliciting endorsements for git, ask those people. -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)
