Resolving conflicts

[Bob Tanner]

On Thursday 21 November 2002 12:53 am, Bob Tanner wrote:
> I'm diving to resolving the non $Id$ conflicts. Since I'm pretty new to
> this project, I'm not sure how to proceed, so I'll just post my questio=
ns
> as I come to them.
>
> I've resolved all the conflicts expect for 21 of them, and they are all=
 in
> the qmake/generators/unix/unixmake2.cpp.
>
> I'm not familiar enough with the code to know how to resolve most of th=
ese
> conflicts.

Ugh! Blew out the file descriptor limit on check in!

Traceback (innermost last):
  File "/cvsroot/kde-cygwin/CVSROOT/syncmail", line 208, in ?
    main()
  File "/cvsroot/kde-cygwin/CVSROOT/syncmail", line 202, in main
    blast_mail(mailcmd, specs[1:], contextlines)
  File "/cvsroot/kde-cygwin/CVSROOT/syncmail", line 138, in blast_mail
    if not os.fork():
OSError: [Errno 11] Resource temporarily unavailable

--=20
Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288