From: Rodney Sparapani <rsparapa@mcw.edu>
Subject: Re: Building on OS X
Date: Fri, 27 Dec 2002 09:41:27 -0600 [thread overview]
Message-ID: <3E0C74A7.7060900@mcw.edu> (raw)
In-Reply-To: tsl1-7FA5DE.10001127122002@newsstand.cit.cornell.edu
When you update via CVS, collisions are marked with diff/patch-like syntax.
So, you just need to remove those files that are giving you trouble and do
another update.
--
Rodney Sparapani Medical College of Wisconsin
Sr. Biostatistician Patient Care & Outcomes Research
rsparapa@mcw.edu http://www.mcw.edu/pcor
Was 'Name That Tune' rigged? WWLD -- What Would Lombardi Do
next prev parent reply other threads:[~2002-12-27 15:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-26 15:03 Building on OS X Timothy Larkin
2002-12-26 15:52 ` Kai Großjohann
2002-12-26 16:58 ` Hugo Wolf
2002-12-27 15:00 ` Timothy Larkin
2002-12-27 15:27 ` Raphaël Berbain
2002-12-27 15:41 ` Rodney Sparapani [this message]
2002-12-27 20:22 ` Kai Großjohann
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=3E0C74A7.7060900@mcw.edu \
--to=rsparapa@mcw.edu \
/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 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).