Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[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. ]]]

  > >     Richard> Author: Richard Stallman <rms@gnu.org>
  > >     Richard> Commit: Richard Stallman <rms@gnu.org>
  > > 
  > >     Richard>     Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
  > >     
  > >     Richard>     What choice do I have?

  > Richard, can you tell what caused you to ask that question?

I did  git pull  and it said there were conflicts.  I resolved the conflicts
and committed them.  Then I did  git pull  again and it asked me why
I was doing the merge.  I could not think of any reason except that
git demanded it.

I have never tried rebasing.  I have been taught that you can easily die
of an overdose that way.  Oh, sorry, that was "freebasing".


-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)