Re: [elpa]: I possibly broke something

[Michael Heerdegen <michael_heerdegen@web.de>]

mr_rookes@yahoo.com writes:

> I don't know. I don't understand the output generated, but seems to be
> related with other packages.

What output?

Seems you are referring to the changes relative to the first parent
commit c523db of your merge commit.

The changes you were actually uploading with the merge are the changes
relative to the other parent commit of your merge, e565b5:

--8<---------------cut here---------------start------------->8---
1 file changed, 3 insertions(+), 3 deletions(-)
packages/transcribe/transcribe.el | 6 +++---

modified   packages/transcribe/transcribe.el
@@ -110,15 +110,15 @@
   " Transcribe"
   '(([?\C-x ?\C-p] . emms-play-file)
     ([?\C-x ?\C-a] . transcribe-analyze-episode)
-    ([?\C-x ?\C-n] . 'NewEpisode)
+    ([?\C-x ?\C-n] . NewEpisode)
     ([?\C-x down] . emms-stop)
     ([?\C-x right] . emms-seek-forward)
     ([?\C-x left] . emms-seek-backward)
     ([f5] . emms-pause)
     ([f6] . transcribe-define-xml-tag)
-    ([f7] . 'transcribe-xml-tag-l2-break)
+    ([f7] . transcribe-xml-tag-l2-break)
     ([f8] . emms-seek)
-    ([f4] . 'transcribe-set-atributes)
+    ([f4] . transcribe-set-atributes)
     ([f11] . transcribe-xml-tag-l1)
     ([f12] . transcribe-xml-tag-l2))
--8<---------------cut here---------------end--------------->8---

That looks sane.

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

I think you did it right.


Michael.