All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Revell <rlrevell@joe-job.com>
To: Raymond <rayau@netvigator.com>
Cc: alsa-devel@lists.sourceforge.net
Subject: Re: Re: Disagreement about versions following CVS update
Date: Sat, 20 Aug 2005 17:06:23 -0400	[thread overview]
Message-ID: <1124571984.2115.5.camel@mindpipe> (raw)
In-Reply-To: <4306D911.70101@netvigator.com>

On Sat, 2005-08-20 at 15:17 +0800, Raymond wrote:
> ./configure: line 4415: syntax error near unexpected token `<<<'
> ./configure: line 4415: `<<<<<<< configure.in' 

This indicates a CVS merge conflict.  Try a fresh checkout.

Lee



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

  reply	other threads:[~2005-08-20 21:06 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-08-19 19:33 Disagreement about versions following CVS update Philip Prindeville
2005-08-19 20:36 ` Lee Revell
2005-08-19 21:11   ` Philip Prindeville
2005-08-19 21:14     ` Lee Revell
2005-08-19 22:17       ` Philip Prindeville
2005-08-19 22:25         ` Lee Revell
2005-08-19 23:20           ` Philip Prindeville
2005-08-19 23:28             ` Lee Revell
2005-08-19 23:43               ` Philip Prindeville
2005-08-19 23:47                 ` Lee Revell
2005-08-19 23:53                   ` Philip Prindeville
2005-08-19 23:56                     ` Lee Revell
2005-08-20  0:06                       ` Philip Prindeville
2005-08-22 12:12                         ` Takashi Iwai
2005-08-22 16:30                           ` Philip Prindeville
2005-08-22 16:33                             ` Takashi Iwai
2005-08-20  7:17 ` Raymond
2005-08-20 21:06   ` Lee Revell [this message]
2005-08-21  0:55     ` Raymond
2005-08-22 12:09       ` Takashi Iwai
2005-08-22 15:13         ` Raymond
2005-08-22 15:29           ` Takashi Iwai
2005-08-22 12:14 ` Takashi Iwai
2005-08-22 16:27   ` Philip Prindeville
2005-08-22 16:29     ` Takashi Iwai

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=1124571984.2115.5.camel@mindpipe \
    --to=rlrevell@joe-job.com \
    --cc=alsa-devel@lists.sourceforge.net \
    --cc=rayau@netvigator.com \
    /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.
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.