From: Eli Zaretskii <eliz@gnu.org>
To: rms@gnu.org
Cc: emacs-devel@gnu.org, kevin.legouguec@gmail.com
Subject: Re: Avoiding the three-windows merging with Git
Date: Wed, 27 Nov 2019 17:45:42 +0200 [thread overview]
Message-ID: <83eextqq55.fsf@gnu.org> (raw)
In-Reply-To: <E1iZr5C-0008Gk-8n@fencepost.gnu.org> (message from Richard Stallman on Wed, 27 Nov 2019 01:45:50 -0500)
> From: Richard Stallman <rms@gnu.org>
> Cc: eliz@gnu.org, emacs-devel@gnu.org
> Date: Wed, 27 Nov 2019 01:45:50 -0500
>
> > Attached is a silly script to create a conflict on a temporary
> > repository. The script creates 3 folders in the current directory:
>
> Does it operate purely locally? No connection to any remote site?
Yes, it arranges for the upstream repository to be on your local
machine, just in another directory.
next prev parent reply other threads:[~2019-11-27 15:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 3:14 Avoiding the three-windows merging with Git Richard Stallman
2019-11-25 3:32 ` Eli Zaretskii
2019-11-26 3:46 ` Richard Stallman
2019-11-26 7:16 ` Kévin Le Gouguec
2019-11-27 6:45 ` Richard Stallman
2019-11-27 9:39 ` Marcin Borkowski
2019-11-27 20:15 ` Kévin Le Gouguec
2019-11-27 22:48 ` Marcin Borkowski
2019-11-28 4:17 ` Richard Stallman
2019-11-27 15:45 ` Eli Zaretskii [this message]
2019-11-27 19:45 ` Kévin Le Gouguec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83eextqq55.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kevin.legouguec@gmail.com \
--cc=rms@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.