From: mr_rookes@yahoo.com
To: michael_heerdegen@web.de
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: [elpa]: I possibly broke something
Date: Wed, 02 Dec 2015 18:17:16 +0100 [thread overview]
Message-ID: <121575.12777.bm@smtp201.mail.bf1.yahoo.com> (raw)
>> I'm sorry about my unexpertise with git. I tried to merge my local
>> changes with the ones Stefan Monnier's did fixing my package and I
>> think I may have downgraded other changes.
>What do you mean by "other changes"? Changes unrelated to your package? Michael.
I don't know. I don't understand the output generated, but seems to be related with other packages. I just added, committed, pulled and pushed. At pulling, I was asked of merging my changes, and I thought I could only change the files in my git add.
next reply other threads:[~2015-12-02 17:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 17:17 mr_rookes [this message]
2015-12-02 17:38 ` [elpa]: I possibly broke something Michael Heerdegen
-- strict thread matches above, loose matches on Subject: below --
2015-12-04 11:37 David González Gándara
2015-12-02 9:59 David González Gándara
2015-12-02 13:04 ` Michael Heerdegen
2015-12-02 23:27 ` Artur Malabarba
2015-12-03 16:58 ` Artur Malabarba
2015-12-03 17:44 ` David Kastrup
2015-12-03 19:52 ` Stefan Monnier
2015-12-03 20:13 ` Artur Malabarba
2015-12-03 20:20 ` David Kastrup
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=121575.12777.bm@smtp201.mail.bf1.yahoo.com \
--to=mr_rookes@yahoo.com \
--cc=emacs-devel@gnu.org \
--cc=michael_heerdegen@web.de \
/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.