> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Fri, 08 Nov 2019 22:26:51 -0500
>
> > 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.
>
>
[[[ 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 have some issues with new mail server so ignore encoding issues.
You should insta
[[[ 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
> >
[[[ 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. ]]]
> > If smerge mode is useful in this situation, how about making its use
> > into
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Sat, 09 Nov 2019 13:04:19 -0500
>
> > 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 display
> From: Richard Stallman
> Cc: psm...@gnu.org, gnu-system-discuss@gnu.org
> Date: Sat, 09 Nov 2019 13:04:23 -0500
>
> How about adding a user option to enable or disable the creation of
> the multiple windows?
>
> (Is it Smerge mode which does that?)
Smerge mode doesn't, so we need first to fig
Le samedi 9 novembre 2019, 14:25:58 CET Richard Stallman a écrit :
> [[[ 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 have
Eli Zaretskii wrote:
> Richard Stallman wrote:
>> 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
Alexandre François Garreau wrote:
> Le samedi 9 novembre 2019, 14:25:58 CET Richard Stallman a écrit :
>> You should install GNU/Linux Activation Technologies Client if you are
>> running GNU/Linux.
>>
>> Most distributions are already selling licenses.
>
> I guess this is a forged, illegitimate
Dmitry Alexandrov <321...@gmail.com> wrote:
> Richard Stallman wrote:
>> > with either GnuPG 2.1 or GnuPG 2.2 setting:
>>
>> > (setq epa-pinentry-mode 'loopback) ;; for Emacs 26
>> > (setq epg-pinentry-mode 'loopback) ;; for Emacs 27
>>
>> > works like a charm.
>> Also, I don't know wha
Le samedi 9 novembre 2019 21:27:41 CET, vous avez écrit :
> Alexandre François Garreau wrote:
> > Le samedi 9 novembre 2019, 14:25:58 CET Richard Stallman a écrit :
> >> You should install GNU/Linux Activation Technologies Client if you are
> >> running GNU/Linux.
> >>
> >> Most distributions are
>From there it seems the conversation grows increasingly emacs-specific. help-
gnu-emacs might be more on-topic and bring more help.
Le samedi 9 novembre 2019, 21:44:46 CET Dmitry Alexandrov a écrit :
> In the light of yet another letter from your impostor, do you have any more
> unresolved questions, that impede you from starting to sign mail? Feel
> free to ask them.
Note signing can be avoided with effective spf policy. Th
Alexandre François Garreau wrote:
> Le samedi 9 novembre 2019 21:27:41 CET, vous avez écrit :
>> Yes, of course. Though, would consider the fact that it originates from the
>> Ukraine more suspicious, than usage of PHP mailer.
>
> Knowing rms’ config: PHP mailer and Message-ID not coming from ema
Alexandre François Garreau wrote:
> Le samedi 9 novembre 2019, 21:44:46 CET Dmitry Alexandrov a écrit :
>> In the light of yet another letter from your impostor, do you have any more
>> unresolved questions, that impede you from starting to sign mail? Feel free
>> to ask them.
>
> Note signing
Le samedi 9 novembre 2019 23:32:59 CET, vous avez écrit :
> Alexandre François Garreau wrote:
> > Le samedi 9 novembre 2019, 21:44:46 CET Dmitry Alexandrov a écrit :
> >> In the light of yet another letter from your impostor, do you have any
> >> more unresolved questions, that impede you from sta
Alexandre François Garreau wrote:
> Le samedi 9 novembre 2019 23:32:59 CET, vous avez écrit :
>> Alexandre François Garreau wrote:
>> > Le samedi 9 novembre 2019, 21:44:46 CET Dmitry Alexandrov a écrit :
>> >> In the light of yet another letter from your impostor, do you have any
>> >> more unre
nipponm...@firemail.cc wrote:
> You joke
No, I do not take credit for this joke. Neither I know who does.
> but GrSecurity is selling licenses for it's kernel patch for $10,000, and
> does per-seat licensing. It prevents redistribution of it's derivative work
> via an "access agreement" where-
[[[ 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. ]]]
> > How about adding a user option to enable or disable the creation of
> > the m
You joke, but GrSecurity is selling licenses for it's kernel patch for
$10,000, and does per-seat licensing. It prevents redistribution of it's
derivative work via an "access agreement" where-in the licensee promises
not to redistribute the derivative work, or else suffer a forfeiture of
his re
Alexandre François Garreau:
One of the benefits of the Free Software is that (theoretically*)
one does not have to agree with the Authors in-order to enjoy and
improve the software, nor do the Authors have to agree with other
contributors to bring in their changes.
You have condemn
RMS: I'd like to note that I too have had annoying problems with git
regarding merge conflicts, in the past.
My solution was to hand patch everything. I know the code much better
now!
On 2019-11-10 03:49, Richard Stallman wrote:
[[[ To any NSA and FBI agents reading my email: please consider
22 matches
Mail list logo
