[[[ 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. ]]]
> > > The only difference is that after resolving the conflicts you need to > > > say "git commit", so that the conflict resolution is recorded in your > > > local repository. > > > > That would be easy enough, but I did not get that far. > Can you remember what stopped you? Was that the fact that Emacs > turned on smerge-mode, or was it something else? Smerge mode certainly stopped me from proceeding along that path. But I think I next tried looking at the file itself, and did not see how to proceed from there. It is a shame that it is so hard to reproduce this situation intentionally. I can't do it by myself. A confl8ict is sheer (bad) luck. > Smerge mode is a minor mode, so I don't see why you'd want to turn it > off, it doesn't get in the way of your editing in any way. When I got the conflict, it displayed several windows. I did not know what these windows were showing me, so I was totally unable to proceed. I did not dare try to find out by trial and error what those windows were showing, not when committing something to the Emacs master! All I could do was stop and touch nothing. Was it Smerge mode which put up those windows? Or was it something else? Was one of those windows a buffer I could simply edit manually? If so, which one is it? If I delete the other windows and edit manually, will that enable me to proceed by msnusl merging? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)
