From: Leo Liu <sdl.web@gmail.com>
To: emacs-devel@gnu.org
Subject: Re: ELPA screwup
Date: Tue, 22 Apr 2014 23:56:02 +0800 [thread overview]
Message-ID: <m3sip5s6i5.fsf@gmail.com> (raw)
In-Reply-To: <87y4yx4olv.fsf@zigzag.favinet> (Thien-Thi Nguyen's message of "Tue, 22 Apr 2014 12:58:52 +0200")
On 2014-04-22 12:58 +0200, Thien-Thi Nguyen wrote:
> I'm no Git expert and would like to avoid trouble in the future.
> Could you please summarize what happened, including the commands
> issued?
I have easy-kill as a remote on the elpa repo and this morning I ran
'git pull -s subtree easy-kill master' and pushed. The same command that
worked previously somehow managed to merge changes into the admin/
directory.
It seems the best option to correct this is to reset head to before the
merge and do the subtree merge right. The second best option (which is
what I did) seems to be git mv things to the right subdirectory and
restore deleted files if any.
Leo
next prev parent reply other threads:[~2014-04-22 15:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 0:42 ELPA screwup Leo Liu
2014-04-22 1:25 ` Dmitry Gutov
2014-04-22 1:44 ` Leo Liu
2014-04-22 3:20 ` Stefan Monnier
2014-04-22 3:45 ` Leo Liu
2014-04-22 8:42 ` Leo Liu
2014-04-22 10:58 ` Thien-Thi Nguyen
2014-04-22 15:56 ` Leo Liu [this message]
2014-04-22 14:36 ` Stefan Monnier
2014-04-22 15:50 ` Leo Liu
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3sip5s6i5.fsf@gmail.com \
--to=sdl.web@gmail.com \
--cc=emacs-devel@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).