From: Jarmo Hurri <jarmo.hurri@syk.fi>
To: emacs-orgmode@gnu.org
Subject: Re: Make errors from a fresh git clone
Date: Sun, 23 Sep 2012 17:52:24 +0300 [thread overview]
Message-ID: <873928hjvb.fsf@syk.fi> (raw)
In-Reply-To: 87obkw95ju.fsf@Rainer.invalid
Achim Gratz <Stromeko@nexgo.de> writes:
> Jarmo Hurri writes:
>> Any ideas of what might be going wrong?
>
> Bastien committed a merge conflict in org-agenda. I've pushed up a
> fix, but it should probably be reviewed again.
Ok, it compiles now. Thanks!
I thought the decription "fresh git clone" would specify where I was:
master and latest revision.
sh-4.2$ git status
# On branch master
nothing to commit (working directory clean)
sh-4.2$ git describe
release_7.9.1-314-g998e556
sh-4.2$ git log -2
commit 998e5565c4043702a5f583236b0db22bd526dcb4
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sun Sep 23 16:27:25 2012 +0200
Fix merge conflict in org-agenda.el
* lisp/org-agenda.el: Merge conflict due to additional parameters in
both maint and master resolved.
Needs review!
commit ed991f49d7f5d27664ff09ae19e6b7e9690edbfb
Merge: a14948c 5a29711
Author: Bastien Guerry <bzg@altern.org>
Date: Sun Sep 23 12:01:05 2012 +0200
Merge branch 'maint'
--
Jarmo
next prev parent reply other threads:[~2012-09-23 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 11:54 Make errors from a fresh git clone Jarmo Hurri
2012-09-23 14:28 ` Achim Gratz
2012-09-23 14:52 ` Jarmo Hurri [this message]
2012-09-23 15:24 ` Bastien
2012-09-23 15:23 ` Bastien
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=873928hjvb.fsf@syk.fi \
--to=jarmo.hurri@syk.fi \
--cc=emacs-orgmode@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/org-mode.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).