Tim,
On 2005 Jan 18 , at 21.15, Tim Jenness wrote:
> Are there meant to be conflicts in this message?
>
> On Tue, 18 Jan 2005, Norman Gray (GLA) wrote:
>
>> Update of /cvs/thirdparty/fsf/m4
>> In directory saturn:/tmp/cvs-serv15509
>>
>> Log Message:
>> Import of m4 1.4.1
Not _meant_ to, but it's OK that there are. This is the import of the
updated version, which for some reason is very jumpy about finding
conflicts. When this is actually merged with the HEAD, there are
rather fewer conflicts, which were in this case easily resolved, then
committed.
In general, as you know, you can't commit files containing conflicts.
Norman
--
----------------------------------------------------------------------
Norman Gray : Physics & Astronomy, Glasgow University, UK
http://www.astro.gla.ac.uk/users/norman/ : www.starlink.ac.uk
|