[[[ 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. ]]]
> Would you mind describing in detail your workflow for handling merge > conflicts with CVS, including VC commands you invoke and commands you > invoke from the shell (if there are any)? Before checking in changes, I do cvs update to merge in any changes in the repository. (I can't remember whether attempting to do checkin does an update first; if not, then it tells you you should do an update.) cvs update indicates conflicts in the text of the source file. I edit that file to resolve the conflicts, then save the file. Then checkin works. If there is a way to make git pull indicate conflicts in the file that way, so I could resolve them, save, pull again, then commit, then I could use git the way I use cvs. What happens with git push if some conflicting other change has been installed in the repository in the mean time? Maybe that is what fell on the floor. -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)
